openstack
/
deb-python-concurrent.futures
Code Issues Proposed changes

Merge pull request #43 from leojay/master 

Issue #20319: concurrent.futures.wait() can block forever even if Fut…
This commit is contained in:
Alex Grönholm 2015-07-27 11:26:50 +03:00
parent 35e77648b7 a6b180a71f
commit b60cc06451
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
concurrent/futures/_base.py
View File

@ -227,7 +227,8 @@ def as_completed(fs, timeout=None):
finally:
for f in fs:
f._waiters.remove(waiter)
with f._condition:
f._waiters.remove(waiter)
DoneAndNotDoneFutures = collections.namedtuple(
'DoneAndNotDoneFutures', 'done not_done')
@ -274,7 +275,8 @@ def wait(fs, timeout=None, return_when=ALL_COMPLETED):
waiter.event.wait(timeout)
for f in fs:
f._waiters.remove(waiter)
with f._condition:
f._waiters.remove(waiter)
done.update(waiter.finished_futures)
return DoneAndNotDoneFutures(done, set(fs) - done)