bpo-30418: Popen.communicate() always ignore EINVAL (#2002) (#2004)
On Windows, subprocess.Popen.communicate() now also ignore EINVAL
on stdin.write() if the child process is still running but closed the
pipe.
(cherry picked from commit d52aa31378ae43e044a300edfe8285954c167216)
diff --git a/Lib/subprocess.py b/Lib/subprocess.py
index 1721269..e626a8a 100644
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -776,19 +776,21 @@
self.stdin.write(input)
except BrokenPipeError:
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
- # if the process already exited before the write
+ except OSError as exc:
+ if exc.errno == errno.EINVAL:
+ # bpo-19612, bpo-30418: On Windows, stdin.write() fails
+ # with EINVAL if the child process exited or if the child
+ # process is still running but closed the pipe.
pass
else:
raise
+
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:
+ except OSError as exc:
+ if exc.errno == errno.EINVAL:
pass
else:
raise
diff --git a/Misc/NEWS b/Misc/NEWS
index b819c6d..d10e7a3 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -45,6 +45,9 @@
Library
-------
+- bpo-30418: On Windows, subprocess.Popen.communicate() now also ignore EINVAL
+ on stdin.write() if the child process is still running but closed the pipe.
+
- bpo-29822: inspect.isabstract() now works during __init_subclass__. Patch
by Nate Soares.