From 403f8cf425cd45a3ffcdd277091be465dce35532 Mon Sep 17 00:00:00 2001 From: Brian Quinlan Date: Sat, 1 Feb 2014 11:49:04 +1100 Subject: [PATCH] Issue #20319: concurrent.futures.wait() can block forever even if Futures have completed --- Lib/concurrent/futures/_base.py | 6 ++++-- Misc/NEWS | 6 ++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Lib/concurrent/futures/_base.py b/Lib/concurrent/futures/_base.py index c3b1f017e0e28a..acd05d0b2aabd8 100644 --- a/Lib/concurrent/futures/_base.py +++ b/Lib/concurrent/futures/_base.py @@ -225,7 +225,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') @@ -272,7 +273,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) diff --git a/Misc/NEWS b/Misc/NEWS index d4fb7210b690f9..a62f7488940429 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -69,6 +69,12 @@ Library - Issue #17481: inspect.getfullargspec() now uses inspect.signature() API. +- Issue #15304: concurrent.futures.wait() can block forever even if + Futures have completed. Patch by Glenn Langford. + +Fix warning message when `os.chdir()` fails inside + `test.support.temp_cwd()`. Patch by Chris Jerdonek. + IDLE ----