Skip to content

Commit 1fb44de

Browse files
committed
Restructured defer fixes to raise exception.
Instead of printing a warning, this restructures the `defer` argument checking to raise an exception if an invalid value has been provided.
1 parent 5c9d75a commit 1fb44de

File tree

1 file changed

+10
-14
lines changed

1 file changed

+10
-14
lines changed

src/prpy/base/robot.py

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -315,12 +315,11 @@ def do_postprocess():
315315
executor = get_default_executor()
316316

317317
return wrap_future(executor.submit(do_postprocess))
318+
elif defer is False:
319+
return do_postprocess()
318320
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))
322322

323-
return do_postprocess()
324323

325324
def ExecutePath(self, path, defer=False, executor=None, **kwargs):
326325
""" Post-process and execute an un-timed path.
@@ -362,12 +361,11 @@ def do_execute():
362361
executor = get_default_executor()
363362

364363
return wrap_future(executor.submit(do_execute))
364+
elif defer is False:
365+
return do_execute()
365366
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))
369368

370-
return do_execute()
371369

372370
def ExecuteTrajectory(self, traj, defer=False, timeout=None, period=0.01):
373371
""" Executes a time trajectory on the robot.
@@ -443,14 +441,12 @@ def do_poll():
443441
raise trollius.Return(None)
444442

445443
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:
451445
util.WaitForControllers(active_controllers, timeout=timeout)
446+
return traj
447+
else:
448+
raise ValueError('Received unexpected value "{:s}" for defer.'.format(defer))
452449

453-
return traj
454450

455451
def ViolatesVelocityLimits(self, traj):
456452
"""

0 commit comments

Comments
 (0)