summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Lib/multiprocessing/pool.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/Lib/multiprocessing/pool.py b/Lib/multiprocessing/pool.py
index 2a8fae1c6a..8555da965f 100644
--- a/Lib/multiprocessing/pool.py
+++ b/Lib/multiprocessing/pool.py
@@ -447,12 +447,10 @@ class Pool(object):
if pool and hasattr(pool[0], 'terminate'):
debug('joining pool workers')
for p in pool:
- p.join()
- for w in pool:
- if w.exitcode is None:
+ if p.is_alive():
# worker has not yet exited
- debug('cleaning up worker %s' % w.pid)
- w.join()
+ debug('cleaning up worker %d' % p.pid)
+ p.join()
#
# Class whose instances are returned by `Pool.apply_async()`