summaryrefslogtreecommitdiffstats
path: root/Lib/concurrent
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2014-01-27 08:11:48 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2014-01-27 08:11:48 (GMT)
commitb9915973f3522d3feaa862aaacd4d7d269f6fc72 (patch)
treee30a6634ad08bd39d80f606075d763b029b6b40b /Lib/concurrent
parentd1c85fd2835bafa0fde0b95b82b6e0fffd60649a (diff)
downloadcpython-b9915973f3522d3feaa862aaacd4d7d269f6fc72.zip
cpython-b9915973f3522d3feaa862aaacd4d7d269f6fc72.tar.gz
cpython-b9915973f3522d3feaa862aaacd4d7d269f6fc72.tar.bz2
Issue #20367: Fix behavior of concurrent.futures.as_completed() for duplicate
arguments. Patch by Glenn Langford.
Diffstat (limited to 'Lib/concurrent')
-rw-r--r--Lib/concurrent/futures/_base.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/Lib/concurrent/futures/_base.py b/Lib/concurrent/futures/_base.py
index ca3aebd..d45a404 100644
--- a/Lib/concurrent/futures/_base.py
+++ b/Lib/concurrent/futures/_base.py
@@ -181,7 +181,8 @@ def as_completed(fs, timeout=None):
Returns:
An iterator that yields the given Futures as they complete (finished or
- cancelled).
+ cancelled). If any given Futures are duplicated, they will be returned
+ once.
Raises:
TimeoutError: If the entire result iterator could not be generated
@@ -190,11 +191,12 @@ def as_completed(fs, timeout=None):
if timeout is not None:
end_time = timeout + time.time()
+ fs = set(fs)
with _AcquireFutures(fs):
finished = set(
f for f in fs
if f._state in [CANCELLED_AND_NOTIFIED, FINISHED])
- pending = set(fs) - finished
+ pending = fs - finished
waiter = _create_and_install_waiters(fs, _AS_COMPLETED)
try: