From: Victor Stinner <victor.stinner@gmail.com>
Date: Tue, 18 Feb 2014 21:00:53 +0000 (+0100)
Subject: Issue #19612: On Windows, subprocess.Popen.communicate() now ignores
X-Git-Tag: v3.3.5rc1~11
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d5c8ce7cc03d81402b2fcdc023fb6ea44ac70f25;p=thirdparty%2FPython%2Fcpython.git

Issue #19612: On Windows, subprocess.Popen.communicate() now ignores
OSError(22, 'Invalid argument') when writing input data into stdin, whereas
the process already exited.
---

diff --git a/Lib/subprocess.py b/Lib/subprocess.py
index d75a4e040445..86592a111de1 100644
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -1193,7 +1193,15 @@ class Popen(object):
                     try:
                         self.stdin.write(input)
                     except IOError as e:
-                        if e.errno != errno.EPIPE:
+                        if e.errno == errno.EPIPE:
+                            # ignore pipe full 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 211114747f36..aed4eff0a1d7 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -20,6 +20,10 @@ Core and Builtins
 Library
 -------
 
+- Issue #19612: On Windows, subprocess.Popen.communicate() now ignores
+  OSError(22, 'Invalid argument') when writing input data into stdin, whereas
+  the process already exited.
+
 - Issue #6815: os.path.expandvars() now supports non-ASCII environment
   variables names and values.
 
@@ -27,7 +31,7 @@ Library
   Based on patch by Stephen Tu.
 
 - Issue #8478: Untokenizer.compat processes first token from iterator input.
-  Patch based on lines from Georg Brandl, Eric Snow, and Gareth Rees.  
+  Patch based on lines from Georg Brandl, Eric Snow, and Gareth Rees.
 
 - Issue #20594: Avoid name clash with the libc function posix_close.