Issue #21619: Popen objects no longer leave a zombie after exit in the with
statement if the pipe was broken. Patch by Martin Panter.
diff --git a/Lib/subprocess.py b/Lib/subprocess.py
index bc0ef0b..f11e538 100644
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -896,10 +896,12 @@
self.stdout.close()
if self.stderr:
self.stderr.close()
- if self.stdin:
- self.stdin.close()
- # Wait for the process to terminate, to avoid zombies.
- self.wait()
+ try: # Flushing a BufferedWriter may raise an error
+ if self.stdin:
+ self.stdin.close()
+ finally:
+ # Wait for the process to terminate, to avoid zombies.
+ self.wait()
def __del__(self, _maxsize=sys.maxsize):
if not self._child_created:
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index 08af71f..caa36cf 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -2521,6 +2521,21 @@
stderr=subprocess.PIPE) as proc:
pass
+ def test_broken_pipe_cleanup(self):
+ """Broken pipe error should not prevent wait() (Issue 21619)"""
+ proc = subprocess.Popen([sys.executable, "-c",
+ "import sys;"
+ "sys.stdin.close();"
+ "sys.stdout.close();" # Signals that input pipe is closed
+ ], stdin=subprocess.PIPE, stdout=subprocess.PIPE)
+ proc.stdout.read() # Make sure subprocess has closed its input
+ proc.stdin.write(b"buffered data")
+ self.assertIsNone(proc.returncode)
+ self.assertRaises(BrokenPipeError, proc.__exit__, None, None, None)
+ self.assertEqual(0, proc.returncode)
+ self.assertTrue(proc.stdin.closed)
+ self.assertTrue(proc.stdout.closed)
+
def test_main():
unit_tests = (ProcessTestCase,
diff --git a/Misc/NEWS b/Misc/NEWS
index 8888f79..05fde70 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -13,6 +13,9 @@
Library
-------
+- Issue #21619: Popen objects no longer leave a zombie after exit in the with
+ statement if the pipe was broken. Patch by Martin Panter.
+
- Issue #6639: Module-level turtle functions no longer raise TclError after
closing the window.