mirror of
https://github.com/python/cpython.git
synced 2024-12-02 22:35:26 +08:00
(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:
commit
5f47ac2aaa
@ -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()
|
||||
|
||||
|
@ -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.
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user