[Python-checkins] cpython (3.2): Issue #11814: Fix likely typo in multiprocessing.Pool._terminate().

[antoine.pitrou]

http://hg.python.org/cpython/rev/c046b7e1087b
changeset:   69237:c046b7e1087b
branch:      3.2
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Mon Apr 11 00:20:23 2011 +0200
summary:
  Issue #11814: Fix likely typo in multiprocessing.Pool._terminate().

files:
  Lib/multiprocessing/pool.py |  2 +-
  Misc/NEWS                   |  2 ++
  2 files changed, 3 insertions(+), 1 deletions(-)


diff --git a/Lib/multiprocessing/pool.py b/Lib/multiprocessing/pool.py
--- a/Lib/multiprocessing/pool.py
+++ b/Lib/multiprocessing/pool.py
@@ -500,7 +500,7 @@
         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
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -53,6 +53,8 @@
 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.

-- 
Repository URL: http://hg.python.org/cpython