Removed func_parts looping from cmdhandler - it didn't work as expected, as shown in #438. Instead reworked utils.delay() to implement the same functionality explicitly.

This commit is contained in:
Griatch 2014-02-15 23:33:19 +01:00
parent 393a3e5e73
commit 6ea4125ef1
2 changed files with 10 additions and 16 deletions

View file

@ -399,14 +399,6 @@ def cmdhandler(called_by, raw_string, testing=False, callertype="session", sessi
# (return value is normally None)
ret = yield cmd.func()
if hasattr(cmd, "func_parts"):
# yield on command parts (for multi-part delayed commands)
for func_part in make_iter(cmd.func_parts):
err = yield func_part()
# returning anything but a deferred/None will kill the chain
if err:
break
# post-command hook
yield cmd.at_post_cmd()