Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Lib/concurrent/futures/_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -286,10 +286,11 @@ def wait(fs, timeout=None, return_when=ALL_COMPLETED):
completed. The second set, named 'not_done', contains uncompleted
futures.
"""
fs = set(fs)
with _AcquireFutures(fs):
done = set(f for f in fs
if f._state in [CANCELLED_AND_NOTIFIED, FINISHED])
not_done = set(fs) - done
not_done = fs - done

if (return_when == FIRST_COMPLETED) and done:
return DoneAndNotDoneFutures(done, not_done)
Expand All @@ -309,7 +310,7 @@ def wait(fs, timeout=None, return_when=ALL_COMPLETED):
f._waiters.remove(waiter)

done.update(waiter.finished_futures)
return DoneAndNotDoneFutures(done, set(fs) - done)
return DoneAndNotDoneFutures(done, fs - done)

class Future(object):
"""Represents the result of an asynchronous computation."""
Expand Down