From: Victor Stinner <victor.stinner@gmail.com>
Date: Mon, 28 Jul 2014 22:04:54 +0000 (+0200)
Subject: Issue #19612: subprocess.communicate() now also ignores EINVAL when using at
X-Git-Tag: v2.7.9rc1~334
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c3828075598ca775555b29b78e67d3fa8e856c00;p=thirdparty%2FPython%2Fcpython.git

Issue #19612: subprocess.communicate() now also ignores EINVAL when using at
least two pipes.
---

diff --git a/Lib/subprocess.py b/Lib/subprocess.py
index ce47b5e9ad8d..f9e9104d4573 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()
 
diff --git a/Misc/NEWS b/Misc/NEWS
index f2087c5c5c81..bdd414ebeb93 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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.