Commit 4f61b025 authored by Ross Lagerwall's avatar Ross Lagerwall

Issue #10963: Ensure that subprocess.communicate() never raises EPIPE.

parent 45fdb457
...@@ -326,6 +326,7 @@ import os ...@@ -326,6 +326,7 @@ import os
import traceback import traceback
import gc import gc
import signal import signal
import errno
# Exception classes used by this module. # Exception classes used by this module.
class CalledProcessError(Exception): class CalledProcessError(Exception):
...@@ -358,7 +359,6 @@ if mswindows: ...@@ -358,7 +359,6 @@ if mswindows:
else: else:
import select import select
_has_poll = hasattr(select, 'poll') _has_poll = hasattr(select, 'poll')
import errno
import fcntl import fcntl
import pickle import pickle
...@@ -699,7 +699,11 @@ class Popen(object): ...@@ -699,7 +699,11 @@ class Popen(object):
stderr = None stderr = None
if self.stdin: if self.stdin:
if input: if input:
try:
self.stdin.write(input) self.stdin.write(input)
except IOError as e:
if e.errno != errno.EPIPE and e.errno != errno.EINVAL:
raise
self.stdin.close() self.stdin.close()
elif self.stdout: elif self.stdout:
stdout = self.stdout.read() stdout = self.stdout.read()
...@@ -929,7 +933,11 @@ class Popen(object): ...@@ -929,7 +933,11 @@ class Popen(object):
if self.stdin: if self.stdin:
if input is not None: if input is not None:
try:
self.stdin.write(input) self.stdin.write(input)
except IOError as e:
if e.errno != errno.EPIPE:
raise
self.stdin.close() self.stdin.close()
if self.stdout: if self.stdout:
...@@ -1290,7 +1298,14 @@ class Popen(object): ...@@ -1290,7 +1298,14 @@ class Popen(object):
for fd, mode in ready: for fd, mode in ready:
if mode & select.POLLOUT: if mode & select.POLLOUT:
chunk = input[input_offset : input_offset + _PIPE_BUF] chunk = input[input_offset : input_offset + _PIPE_BUF]
try:
input_offset += os.write(fd, chunk) input_offset += os.write(fd, chunk)
except OSError as e:
if e.errno == errno.EPIPE:
close_unregister_and_remove(fd)
else:
raise
else:
if input_offset >= len(input): if input_offset >= len(input):
close_unregister_and_remove(fd) close_unregister_and_remove(fd)
elif mode & select_POLLIN_POLLPRI: elif mode & select_POLLIN_POLLPRI:
...@@ -1334,7 +1349,15 @@ class Popen(object): ...@@ -1334,7 +1349,15 @@ class Popen(object):
if self.stdin in wlist: if self.stdin in wlist:
chunk = input[input_offset : input_offset + _PIPE_BUF] chunk = input[input_offset : input_offset + _PIPE_BUF]
try:
bytes_written = os.write(self.stdin.fileno(), chunk) bytes_written = os.write(self.stdin.fileno(), chunk)
except OSError as e:
if e.errno == errno.EPIPE:
self.stdin.close()
write_set.remove(self.stdin)
else:
raise
else:
input_offset += bytes_written input_offset += bytes_written
if input_offset >= len(input): if input_offset >= len(input):
self.stdin.close() self.stdin.close()
......
...@@ -592,6 +592,25 @@ class ProcessTestCase(BaseTestCase): ...@@ -592,6 +592,25 @@ class ProcessTestCase(BaseTestCase):
self.assertFalse(os.path.exists(ofname)) self.assertFalse(os.path.exists(ofname))
self.assertFalse(os.path.exists(efname)) self.assertFalse(os.path.exists(efname))
def test_communicate_epipe(self):
# Issue 10963: communicate() should hide EPIPE
p = subprocess.Popen([sys.executable, "-c", 'pass'],
stdin=subprocess.PIPE,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
self.addCleanup(p.stdout.close)
self.addCleanup(p.stderr.close)
self.addCleanup(p.stdin.close)
p.communicate(b"x" * 2**20)
def test_communicate_epipe_only_stdin(self):
# Issue 10963: communicate() should hide EPIPE
p = subprocess.Popen([sys.executable, "-c", 'pass'],
stdin=subprocess.PIPE)
self.addCleanup(p.stdin.close)
time.sleep(2)
p.communicate(b"x" * 2**20)
# #
# POSIX tests # POSIX tests
# #
......
...@@ -44,6 +44,8 @@ Core and Builtins ...@@ -44,6 +44,8 @@ Core and Builtins
Library Library
------- -------
- Issue #10963: Ensure that subprocess.communicate() never raises EPIPE.
- Issue #11696: Fix ID generation in msilib. - Issue #11696: Fix ID generation in msilib.
- Issue #9696: Fix exception incorrectly raised by xdrlib.Packer.pack_int when - Issue #9696: Fix exception incorrectly raised by xdrlib.Packer.pack_int when
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment