summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2011-04-10 22:20:23 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2011-04-10 22:20:23 (GMT)
commitbed9a5b6b38e30b4a207237ac9753cbfa0f2ae99 (patch)
treeea1fb9b4f7a64c1213a7f9d1e08a335d8cb3db6e
parent81dee6b4d4acc061e568e10f976eb77b084ddd26 (diff)
downloadcpython-bed9a5b6b38e30b4a207237ac9753cbfa0f2ae99.zip
cpython-bed9a5b6b38e30b4a207237ac9753cbfa0f2ae99.tar.gz
cpython-bed9a5b6b38e30b4a207237ac9753cbfa0f2ae99.tar.bz2
Issue #11814: Fix likely typo in multiprocessing.Pool._terminate().
-rw-r--r--Lib/multiprocessing/pool.py2
-rw-r--r--Misc/NEWS2
2 files changed, 3 insertions, 1 deletions
diff --git a/Lib/multiprocessing/pool.py b/Lib/multiprocessing/pool.py
index efa0056..92170f2 100644
--- a/Lib/multiprocessing/pool.py
+++ b/Lib/multiprocessing/pool.py
@@ -500,7 +500,7 @@ class Pool(object):
task_handler.join()
debug('joining result handler')
- task_handler.join()
+ result_handler.join()
if pool and hasattr(pool[0], 'terminate'):
debug('joining pool workers')
diff --git a/Misc/NEWS b/Misc/NEWS
index 413f387..e0e6bd2 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -53,6 +53,8 @@ Core and Builtins
Library
-------
+- Issue #11814: Fix likely typo in multiprocessing.Pool._terminate().
+
- Issue #8428: Fix a race condition in multiprocessing.Pool when terminating
worker processes: new processes would be spawned while the pool is being
shut down. Patch by Charles-François Natali.