Commit 162eb5da authored by Denis Bilenko's avatar Denis Bilenko

fix timeout bugs in joinall() function

- when timeout expires it must return to the caller, not raise Timeout
parent 2fbb62da
......@@ -482,7 +482,8 @@ def joinall(greenlets, timeout=None, raise_error=False):
except:
for greenlet in greenlets:
greenlet.unlink(put)
raise
if sys.exc_info()[1] is not timeout:
raise
finally:
timeout.cancel()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment