]> granicus.if.org Git - python/commitdiff
Issue #11814: Fix likely typo in multiprocessing.Pool._terminate().
authorAntoine Pitrou <solipsis@pitrou.net>
Sun, 10 Apr 2011 22:20:23 +0000 (00:20 +0200)
committerAntoine Pitrou <solipsis@pitrou.net>
Sun, 10 Apr 2011 22:20:23 +0000 (00:20 +0200)
Lib/multiprocessing/pool.py
Misc/NEWS

index efa0056732bdfff18d4fe18536267a739e94fc7f..92170f2ee8ceb75589d29cee0d555aaddf5b010c 100644 (file)
@@ -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')
index 413f387c47d796102753d51bacab0359d3b05a2e..e0e6bd222a0dfe75697dac79922608fad1a2d0a1 100644 (file)
--- 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.