diff options
-rw-r--r-- | Lib/multiprocessing/queues.py | 8 | ||||
-rw-r--r-- | Misc/NEWS | 3 |
2 files changed, 4 insertions, 7 deletions
diff --git a/Lib/multiprocessing/queues.py b/Lib/multiprocessing/queues.py index 8584408c60..b7eecefa20 100644 --- a/Lib/multiprocessing/queues.py +++ b/Lib/multiprocessing/queues.py @@ -188,13 +188,7 @@ class Queue(object): debug('... done self._thread.start()') # On process exit we will wait for data to be flushed to pipe. - # - # However, if this process created the queue then all - # processes which use the queue will be descendants of this - # process. Therefore waiting for the queue to be flushed - # is pointless once all the child processes have been joined. - created_by_this_process = (self._opid == os.getpid()) - if not self._joincancelled and not created_by_this_process: + if not self._joincancelled: self._jointhread = Finalize( self._thread, Queue._finalize_join, [weakref.ref(self._thread)], @@ -40,6 +40,9 @@ Core and Builtins Library ------- +- Issue #4106: Fix occasional exceptions printed out by multiprocessing on + interpreter shutdown. + - Issue #11657: Fix sending file descriptors over 255 over a multiprocessing Pipe. |