(Merge 3.3) Issue #19612: On Windows, subprocess.Popen.communicate() now

ignores OSError(22, 'Invalid argument') when writing input data into stdin,
whereas the process already exited.

2 files changed, 13 insertions, 1 deletions

diff --git a/Lib/subprocess.py b/Lib/subprocess.py
index f47f5ab..921670d 100644
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -1186,7 +1186,15 @@ class Popen(object):
                     try:
                         self.stdin.write(input)
                     except OSError as e:
-                        if e.errno != errno.EPIPE:
+                        if e.errno == errno.EPIPE:
+                            # communicate() should 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 caad096..42ab220 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -28,6 +28,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 #20320: select.select() and select.kqueue.control() now round the
   timeout aways from zero, instead of rounding towards zero.