diff options
| -rw-r--r-- | Lib/subprocess.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_subprocess.py | 16 | ||||
| -rw-r--r-- | Misc/NEWS | 4 |
3 files changed, 22 insertions, 0 deletions
diff --git a/Lib/subprocess.py b/Lib/subprocess.py index 094ca1b..31c02df 100644 --- a/Lib/subprocess.py +++ b/Lib/subprocess.py @@ -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) diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py index c2db6fa..123d4a0 100644 --- a/Lib/test/test_subprocess.py +++ b/Lib/test/test_subprocess.py @@ -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 ----------------- |