mirror of
https://github.com/python/cpython
synced 2024-10-07 21:28:25 +00:00
bpo-28326: Fix multiprocessing.Process when stdout and/or stderr is closed or None. (#4073)
This commit is contained in:
parent
73c4708630
commit
daeefd2e04
|
@ -14,8 +14,14 @@ class Popen(object):
|
|||
method = 'fork'
|
||||
|
||||
def __init__(self, process_obj):
|
||||
sys.stdout.flush()
|
||||
sys.stderr.flush()
|
||||
try:
|
||||
sys.stdout.flush()
|
||||
except (AttributeError, ValueError):
|
||||
pass
|
||||
try:
|
||||
sys.stderr.flush()
|
||||
except (AttributeError, ValueError):
|
||||
pass
|
||||
self.returncode = None
|
||||
self.finalizer = None
|
||||
self._launch(process_obj)
|
||||
|
|
|
@ -582,6 +582,27 @@ def test_wait_for_threads(self):
|
|||
proc.join()
|
||||
self.assertTrue(evt.is_set())
|
||||
|
||||
@classmethod
|
||||
def _test_error_on_stdio_flush(self, evt):
|
||||
evt.set()
|
||||
|
||||
def test_error_on_stdio_flush(self):
|
||||
streams = [io.StringIO(), None]
|
||||
streams[0].close()
|
||||
for stream_name in ('stdout', 'stderr'):
|
||||
for stream in streams:
|
||||
old_stream = getattr(sys, stream_name)
|
||||
setattr(sys, stream_name, stream)
|
||||
try:
|
||||
evt = self.Event()
|
||||
proc = self.Process(target=self._test_error_on_stdio_flush,
|
||||
args=(evt,))
|
||||
proc.start()
|
||||
proc.join()
|
||||
self.assertTrue(evt.is_set())
|
||||
finally:
|
||||
setattr(sys, stream_name, old_stream)
|
||||
|
||||
|
||||
#
|
||||
#
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
Fix multiprocessing.Process when stdout and/or stderr is closed or None.
|
Loading…
Reference in a new issue