@@ -315,12 +315,11 @@ def do_postprocess():
315
315
executor = get_default_executor ()
316
316
317
317
return wrap_future (executor .submit (do_postprocess ))
318
+ elif defer is False :
319
+ return do_postprocess ()
318
320
else :
319
- if defer is not False :
320
- logger .warning ('Received unexpected value "%s" for defer.' ,
321
- defer )
321
+ raise ValueError ('Received unexpected value "{:s}" for defer.' .format (defer ))
322
322
323
- return do_postprocess ()
324
323
325
324
def ExecutePath (self , path , defer = False , executor = None , ** kwargs ):
326
325
""" Post-process and execute an un-timed path.
@@ -362,12 +361,11 @@ def do_execute():
362
361
executor = get_default_executor ()
363
362
364
363
return wrap_future (executor .submit (do_execute ))
364
+ elif defer is False :
365
+ return do_execute ()
365
366
else :
366
- if defer is not False :
367
- logger .warning ('Received unexpected value "%s" for defer.' ,
368
- defer )
367
+ raise ValueError ('Received unexpected value "{:s}" for defer.' .format (defer ))
369
368
370
- return do_execute ()
371
369
372
370
def ExecuteTrajectory (self , traj , defer = False , timeout = None , period = 0.01 ):
373
371
""" Executes a time trajectory on the robot.
@@ -443,14 +441,12 @@ def do_poll():
443
441
raise trollius .Return (None )
444
442
445
443
return trollius .async (do_poll ())
446
- else :
447
- if defer is not False :
448
- logger .warning ('Received unexpected value "%s" for defer.' ,
449
- defer )
450
-
444
+ elif defer is not False :
451
445
util .WaitForControllers (active_controllers , timeout = timeout )
446
+ return traj
447
+ else :
448
+ raise ValueError ('Received unexpected value "{:s}" for defer.' .format (defer ))
452
449
453
- return traj
454
450
455
451
def ViolatesVelocityLimits (self , traj ):
456
452
"""
0 commit comments