From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 10 Apr 2011 22:20:23 +0000 (+0200)
Subject: Issue #11814: Fix likely typo in multiprocessing.Pool._terminate().
X-Git-Tag: v3.2.1b1~154
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bed9a5b6b38e30b4a207237ac9753cbfa0f2ae99;p=python

Issue #11814: Fix likely typo in multiprocessing.Pool._terminate().
---

diff --git a/Lib/multiprocessing/pool.py b/Lib/multiprocessing/pool.py
index efa0056732..92170f2ee8 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 413f387c47..e0e6bd222a 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.