Kaydet (Commit) 34ef6da8 authored tarafından Antoine Pitrou's avatar Antoine Pitrou Kaydeden (comit) GitHub

[3.6] bpo-28326: Fix multiprocessing.Process when stdout and/or stderr is closed…

[3.6] bpo-28326: Fix multiprocessing.Process when stdout and/or stderr is closed or None. (GH-4073).  (#4075)

* bpo-28326: Fix multiprocessing.Process when stdout and/or stderr is closed or None. (#4073)

(cherry picked from commit daeefd2e)

* [3.6] bpo-28326: Fix multiprocessing.Process when stdout and/or stderr is closed or None. (GH-4073).
(cherry picked from commit daeefd2e)
üst 1e78ed68
......@@ -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._launch(process_obj)
......
......@@ -425,6 +425,27 @@ class _TestProcess(BaseTestCase):
self.assertEqual(q.get(), 5)
close_queue(q)
@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)
#
#
......
Fix multiprocessing.Process when stdout and/or stderr is closed or None.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment