summaryrefslogtreecommitdiffstats
path: root/Lib/concurrent/futures
diff options
context:
space:
mode:
authorRoss Lagerwall <rosslagerwall@gmail.com>2012-01-08 06:42:03 (GMT)
committerRoss Lagerwall <rosslagerwall@gmail.com>2012-01-08 06:42:03 (GMT)
commit69f39a53f62734d3e8dcb4bdcc217c4b3551d393 (patch)
tree1baf6ceb8e888f0acd7a4c717f32bda2ecfab39f /Lib/concurrent/futures
parent75404274344794012da83362f32b6e1786ef04df (diff)
parent66e2fb68aca2a2678a327b200e657b761f358bc1 (diff)
downloadcpython-69f39a53f62734d3e8dcb4bdcc217c4b3551d393.zip
cpython-69f39a53f62734d3e8dcb4bdcc217c4b3551d393.tar.gz
cpython-69f39a53f62734d3e8dcb4bdcc217c4b3551d393.tar.bz2
Merge with 3.2 for #12364.
Diffstat (limited to 'Lib/concurrent/futures')
-rw-r--r--Lib/concurrent/futures/process.py3
1 files changed, 0 insertions, 3 deletions
diff --git a/Lib/concurrent/futures/process.py b/Lib/concurrent/futures/process.py
index 0575146..7f31ec2 100644
--- a/Lib/concurrent/futures/process.py
+++ b/Lib/concurrent/futures/process.py
@@ -273,9 +273,6 @@ def _queue_management_worker(executor_reference,
if not pending_work_items:
shutdown_worker()
return
- else:
- # Start shutting down by telling a process it can exit.
- call_queue.put_nowait(None)
except Full:
# This is not a problem: we will eventually be woken up (in
# result_queue.get()) and be able to send a sentinel again.