Commit 7cbf5a1e authored by Denis Bilenko's avatar Denis Bilenko

pool: make kill() not raise Timeout

parent 00eccfa1
......@@ -100,6 +100,9 @@ class GreenletSet(object):
if not block:
break
joinall(self.greenlets)
except Timeout, ex:
if ex is not timer:
raise
finally:
timer.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