diff options
author | Victor Stinner <victor.stinner@gmail.com> | 2014-07-29 00:04:54 +0200 |
---|---|---|
committer | Victor Stinner <victor.stinner@gmail.com> | 2014-07-29 00:04:54 +0200 |
commit | c3828075598ca775555b29b78e67d3fa8e856c00 (patch) | |
tree | 300bc9a7ec1681fc4dc3d3c96f0c67d51977adee | |
parent | 110796fb1588b1ab433f327f84175dffde229df8 (diff) | |
download | cpython-git-c3828075598ca775555b29b78e67d3fa8e856c00.tar.gz |
Issue #19612: subprocess.communicate() now also ignores EINVAL when using at
least two pipes.
-rw-r--r-- | Lib/subprocess.py | 10 | ||||
-rw-r--r-- | Misc/NEWS | 3 |
2 files changed, 12 insertions, 1 deletions
diff --git a/Lib/subprocess.py b/Lib/subprocess.py index ce47b5e9ad..f9e9104d45 100644 --- a/Lib/subprocess.py +++ b/Lib/subprocess.py @@ -1035,7 +1035,15 @@ class Popen(object): try: self.stdin.write(input) except IOError as e: - if e.errno != errno.EPIPE: + if e.errno == errno.EPIPE: + # communicate() should ignore broken pipe error + pass + elif (e.errno == errno.EINVAL + and self.poll() is not None): + # Issue #19612: stdin.write() fails with EINVAL + # if the process already exited before the write + pass + else: raise self.stdin.close() @@ -13,6 +13,9 @@ Core and Builtins Library ------- +- Issue #19612: subprocess.communicate() now also ignores EINVAL when using at + least two pipes. + - Fix repr(_socket.socket) on Windows 64-bit: don't fail with OverflowError on closed socket. |