mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-30 05:35:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

merge from 3.5 - Fixes Issue #26373: subprocess.Popen.communicate

Browse source 
now correctly ignores BrokenPipeError when the child process dies
before .communicate() is called in more (all?) circumstances.
This commit is contained in:
Gregory P. Smith ext:(%20%5BGoogle%20Inc.%5D) 2016-06-04 00:34:15 +00:00
commit fcbf1ca4f9
3 changed files with 69 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Lib/subprocess.py
View file

@ -1036,8 +1036,7 @@ class Popen(object):
try:
self.stdin.write(input)
except BrokenPipeError:
# communicate() must ignore broken pipe error
pass
pass # communicate() must ignore broken pipe errors.
except OSError as e:
if e.errno == errno.EINVAL and self.poll() is not None:
# Issue #19612: On Windows, stdin.write() fails with EINVAL
@ -1045,7 +1044,15 @@ class Popen(object):
pass
else:
raise
self.stdin.close()
try:
self.stdin.close()
except BrokenPipeError:
pass # communicate() must ignore broken pipe errors.
except OSError as e:
if e.errno == errno.EINVAL and self.poll() is not None:
pass
else:
raise
def communicate(self, input=None, timeout=None):
"""Interact with process: Send data to stdin. Read data from
@ -1691,9 +1698,15 @@ class Popen(object):
if self.stdin and not self._communication_started:
# Flush stdio buffer. This might block, if the user has
# been writing to .stdin in an uncontrolled fashion.
self.stdin.flush()
try:
self.stdin.flush()
except BrokenPipeError:
pass # communicate() must ignore BrokenPipeError.
if not input:
self.stdin.close()
try:
self.stdin.close()
except BrokenPipeError:
pass # communicate() must ignore BrokenPipeError.
stdout = None
stderr = None