(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.
This commit is contained in:
Victor Stinner 2014-02-18 22:06:35 +01:00
commit 5f47ac2aaa
2 changed files with 13 additions and 1 deletions

View File

@ -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()

View File

@ -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.