diff options
| -rw-r--r-- | Lib/multiprocessing/popen_fork.py | 10 | ||||
| -rw-r--r-- | Lib/test/_test_multiprocessing.py | 21 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2017-10-22-11-06-02.bpo-28326.rxh7L4.rst | 1 |
3 files changed, 30 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) + # # diff --git a/Misc/NEWS.d/next/Library/2017-10-22-11-06-02.bpo-28326.rxh7L4.rst b/Misc/NEWS.d/next/Library/2017-10-22-11-06-02.bpo-28326.rxh7L4.rst new file mode 100644 index 0000000..bcf43bc --- /dev/null +++ b/Misc/NEWS.d/next/Library/2017-10-22-11-06-02.bpo-28326.rxh7L4.rst @@ -0,0 +1 @@ +Fix multiprocessing.Process when stdout and/or stderr is closed or None. |