[Python-checkins] cpython (merge 3.2 -> default): Merge with 3.2

Tue Apr 5 16:10:25 CEST 2011

http://hg.python.org/cpython/rev/c81ad4361c49
changeset: 69156:c81ad4361c49
parent: 69152:3664fc29e867
parent: 69155:a7363288c8d4
user: Ross Lagerwall <rosslagerwall at gmail.com>
date: Tue Apr 05 16:07:49 2011 +0200
summary:
 Merge with 3.2
files:
 Lib/subprocess.py | 45 ++++++++++++++++++------
 Lib/test/test_subprocess.py | 19 ++++++++++
 Misc/NEWS | 2 +
 3 files changed, 55 insertions(+), 11 deletions(-)

diff --git a/Lib/subprocess.py b/Lib/subprocess.py
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -348,6 +348,7 @@
 import signal
 import builtins
 import warnings
+import errno
 
 # Exception classes used by this module.
 class SubprocessError(Exception): pass
@@ -396,7 +397,6 @@
 else:
 import select
 _has_poll = hasattr(select, 'poll')
- import errno
 import fcntl
 import pickle
 
@@ -826,7 +826,11 @@
 stderr = None
 if self.stdin:
 if input:
- self.stdin.write(input)
+ try:
+ self.stdin.write(input)
+ except IOError as e:
+ if e.errno != errno.EPIPE and e.errno != errno.EINVAL:
+ raise
 self.stdin.close()
 elif self.stdout:
 stdout = self.stdout.read()
@@ -1104,7 +1108,11 @@
 
 if self.stdin:
 if input is not None:
- self.stdin.write(input)
+ try:
+ self.stdin.write(input)
+ except IOError as e:
+ if e.errno != errno.EPIPE:
+ raise
 self.stdin.close()
 
 # Wait for the reader threads, or time out. If we time out, the
@@ -1621,9 +1629,16 @@
 if mode & select.POLLOUT:
 chunk = self._input[self._input_offset :
 self._input_offset + _PIPE_BUF]
- self._input_offset += os.write(fd, chunk)
- if self._input_offset >= len(self._input):
- close_unregister_and_remove(fd)
+ try:
+ self._input_offset += os.write(fd, chunk)
+ except OSError as e:
+ if e.errno == errno.EPIPE:
+ close_unregister_and_remove(fd)
+ else:
+ raise
+ else:
+ if self._input_offset >= len(self._input):
+ close_unregister_and_remove(fd)
 elif mode & select_POLLIN_POLLPRI:
 data = os.read(fd, 4096)
 if not data:
@@ -1691,11 +1706,19 @@
 if self.stdin in wlist:
 chunk = self._input[self._input_offset :
 self._input_offset + _PIPE_BUF]
- bytes_written = os.write(self.stdin.fileno(), chunk)
- self._input_offset += bytes_written
- if self._input_offset >= len(self._input):
- self.stdin.close()
- self._write_set.remove(self.stdin)
+ try:
+ bytes_written = os.write(self.stdin.fileno(), chunk)
+ except OSError as e:
+ if e.errno == errno.EPIPE:
+ self.stdin.close()
+ self._write_set.remove(self.stdin)
+ else:
+ raise
+ else:
+ self._input_offset += bytes_written
+ if self._input_offset >= len(self._input):
+ self.stdin.close()
+ self._write_set.remove(self.stdin)
 
 if self.stdout in rlist:
 data = os.read(self.stdout.fileno(), 1024)
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -720,6 +720,25 @@
 self.assertFalse(os.path.exists(ofname))
 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)
+
 
 # context manager
 class _SuppressCoreFiles(object):
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -94,6 +94,8 @@
 Library
 -------
 
+- Issue #10963: Ensure that subprocess.communicate() never raises EPIPE.
+
 - Issue #10791: Implement missing method GzipFile.read1(), allowing GzipFile
 to be wrapped in a TextIOWrapper. Patch by Nadeem Vawda.
 
-- 
Repository URL: http://hg.python.org/cpython
