Merge with 3.2 for #12364.

This commit is contained in:
Ross Lagerwall 2012-01-08 08:42:03 +02:00
commit 69f39a53f6
3 changed files with 10 additions and 3 deletions

View file

@ -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.