[Python-checkins] r87485 - in python/branches/py3k: Lib/subprocess.py Lib/test/test_subprocess.py Misc/NEWS
victor.stinner
python-checkins at python.org
Sat Dec 25 23:40:38 CET 2010
Author: victor.stinner
Date: Sat Dec 25 23:40:32 2010
New Revision: 87485
Log:
Issue #10763: subprocess.communicate() closes stdout and stderr if both are
pipes (bug specific to Windows).
Improve also the unit test: write a portable unit test.
Modified:
python/branches/py3k/Lib/subprocess.py
python/branches/py3k/Lib/test/test_subprocess.py
python/branches/py3k/Misc/NEWS
Modified: python/branches/py3k/Lib/subprocess.py
==============================================================================
--- python/branches/py3k/Lib/subprocess.py (original)
+++ python/branches/py3k/Lib/subprocess.py Sat Dec 25 23:40:32 2010
@@ -985,6 +985,7 @@
def _readerthread(self, fh, buffer):
buffer.append(fh.read())
+ fh.close()
def _communicate(self, input):
Modified: python/branches/py3k/Lib/test/test_subprocess.py
==============================================================================
--- python/branches/py3k/Lib/test/test_subprocess.py (original)
+++ python/branches/py3k/Lib/test/test_subprocess.py Sat Dec 25 23:40:32 2010
@@ -366,22 +366,28 @@
self.assertEqual(stdout, b"banana")
self.assertStderrEqual(stderr, b"pineapple")
- # This test is Linux specific for simplicity to at least have
- # some coverage. It is not a platform specific bug.
- @unittest.skipUnless(os.path.isdir('/proc/%d/fd' % os.getpid()),
- "Linux specific")
# Test for the fd leak reported in http://bugs.python.org/issue2791.
def test_communicate_pipe_fd_leak(self):
- fd_directory = '/proc/%d/fd' % os.getpid()
- num_fds_before_popen = len(os.listdir(fd_directory))
- p = subprocess.Popen([sys.executable, "-c", "print()"],
- stdout=subprocess.PIPE)
- p.communicate()
- num_fds_after_communicate = len(os.listdir(fd_directory))
- del p
- num_fds_after_destruction = len(os.listdir(fd_directory))
- self.assertEqual(num_fds_before_popen, num_fds_after_destruction)
- self.assertEqual(num_fds_before_popen, num_fds_after_communicate)
+ for stdin_pipe in (False, True):
+ for stdout_pipe in (False, True):
+ for stderr_pipe in (False, True):
+ options = {}
+ if stdin_pipe:
+ options['stdin'] = subprocess.PIPE
+ if stdout_pipe:
+ options['stdout'] = subprocess.PIPE
+ if stderr_pipe:
+ options['stderr'] = subprocess.PIPE
+ if not options:
+ continue
+ p = subprocess.Popen((sys.executable, "-c", "pass"), **options)
+ p.communicate()
+ if p.stdin is not None:
+ self.assertTrue(p.stdin.closed)
+ if p.stdout is not None:
+ self.assertTrue(p.stdout.closed)
+ if p.stderr is not None:
+ self.assertTrue(p.stderr.closed)
def test_communicate_returns(self):
# communicate() should return None if no redirection is active
Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS (original)
+++ python/branches/py3k/Misc/NEWS Sat Dec 25 23:40:32 2010
@@ -11,6 +11,9 @@
Library
-------
+- Issue #10763: subprocess.communicate() closes stdout and stderr if both are
+ pipes (bug specific to Windows).
+
- Issue #1693546: fix email.message RFC 2231 parameter encoding to be in better
compliance (no "s around encoded values).
More information about the Python-checkins
mailing list