summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorAntoine Pitrou <pitrou@free.fr>2017-10-22 09:40:31 (GMT)
committerGitHub <noreply@github.com>2017-10-22 09:40:31 (GMT)
commitdaeefd2e049b74340307481112a39f77de0f4769 (patch)
tree7b55a2b183b67fef2f41257d2a87b3f2e87ee02e /Lib
parent73c4708630f99b94c35476529748629fff1fc63e (diff)
downloadcpython-daeefd2e049b74340307481112a39f77de0f4769.zip
cpython-daeefd2e049b74340307481112a39f77de0f4769.tar.gz
cpython-daeefd2e049b74340307481112a39f77de0f4769.tar.bz2
bpo-28326: Fix multiprocessing.Process when stdout and/or stderr is closed or None. (#4073)
Diffstat (limited to 'Lib')
-rw-r--r--Lib/multiprocessing/popen_fork.py10
-rw-r--r--Lib/test/_test_multiprocessing.py21
2 files changed, 29 insertions, 2 deletions
diff --git a/Lib/multiprocessing/popen_fork.py b/Lib/multiprocessing/popen_fork.py
index cbdbfa7..b0fc013 100644
--- a/Lib/multiprocessing/popen_fork.py
+++ b/Lib/multiprocessing/popen_fork.py
@@ -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)
diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py
index 8e004e2..69c0bd8 100644
--- a/Lib/test/_test_multiprocessing.py
+++ b/Lib/test/_test_multiprocessing.py
@@ -582,6 +582,27 @@ class _TestProcess(BaseTestCase):
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)
+
#
#