Backport r62724 from trunk. Fixes issue 2791. subprocess.Popen.communicate
now closes its stdout and stderr fds as soon as it is finished with them.
This commit is contained in:
parent
1a34834e09
commit
26660401c0
|
@ -660,8 +660,10 @@ class Popen(object):
|
|||
self.stdin.close()
|
||||
elif self.stdout:
|
||||
stdout = self.stdout.read()
|
||||
self.stdout.close()
|
||||
elif self.stderr:
|
||||
stderr = self.stderr.read()
|
||||
self.stderr.close()
|
||||
self.wait()
|
||||
return (stdout, stderr)
|
||||
|
||||
|
|
|
@ -304,6 +304,22 @@ class ProcessTestCase(unittest.TestCase):
|
|||
self.assertEqual(remove_stderr_debug_decorations(stderr),
|
||||
"pineapple")
|
||||
|
||||
# This test is Linux specific for simplicity to at least have
|
||||
# some coverage. It is not a platform specific bug.
|
||||
if os.path.isdir('/proc/%d/fd' % os.getpid()):
|
||||
# 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)
|
||||
|
||||
def test_communicate_returns(self):
|
||||
# communicate() should return None if no redirection is active
|
||||
p = subprocess.Popen([sys.executable, "-c",
|
||||
|
|
|
@ -82,6 +82,10 @@ Library
|
|||
- Bug #1433694: minidom's .normalize() failed to set .nextSibling for
|
||||
last child element.
|
||||
|
||||
- Issue #2791: subprocess.Popen.communicate explicitly closes its
|
||||
stdout and stderr fds rather than leaving them open until the
|
||||
instance is destroyed.
|
||||
|
||||
|
||||
Extension Modules
|
||||
-----------------
|
||||
|
|
Loading…
Reference in New Issue