Merge with 3.1

rosslagerwall · rosslagerwall · commit 17ace7a07c4f · 2011-03-26T21:21:46.000+02:00
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
@@ -1226,6 +1226,7 @@ def test_select_unbuffered(self):
                              stdout=subprocess.PIPE,
                              bufsize=0)
         f = p.stdout
+        self.addCleanup(f.close)
         try:
             self.assertEqual(f.read(4), b"appl")
             self.assertIn(f, select.select([f], [], [], 0.0)[0])
diff --git a/Misc/ACKS b/Misc/ACKS
@@ -354,6 +354,7 @@ Brian Harring
 Larry Hastings
 Shane Hathaway
 Rycharde Hawkes
+Ben Hayden
 Jochen Hayek
 Christian Heimes
 Thomas Heller
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -53,6 +53,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #11659: Fix ResourceWarning in test_subprocess introduced by #11459.
+  Patch by Ben Hayden.
+
 - Issue #11635: Don't use polling in worker threads and processes launched by
   concurrent.futures.
 
