summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Lagerwall <rosslagerwall@gmail.com>2011-03-26 19:22:09 (GMT)
committerRoss Lagerwall <rosslagerwall@gmail.com>2011-03-26 19:22:09 (GMT)
commit4aeb542a72ed44b56adc6fe190a6d84ebdfe140e (patch)
tree4413731cb5af21085e1c15df21e1b0a1796fdfbe
parent0a3a7d35ca7f3a8a1de84cdc7b494c48afd8e0f9 (diff)
parent17ace7a07c4fe23afc25383799aa184dbb707f14 (diff)
downloadcpython-4aeb542a72ed44b56adc6fe190a6d84ebdfe140e.zip
cpython-4aeb542a72ed44b56adc6fe190a6d84ebdfe140e.tar.gz
cpython-4aeb542a72ed44b56adc6fe190a6d84ebdfe140e.tar.bz2
Merge with 3.2
-rw-r--r--Lib/test/test_subprocess.py1
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS3
3 files changed, 5 insertions, 0 deletions
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index 6523c8a..9729c9a 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -1325,6 +1325,7 @@ class POSIXProcessTestCase(BaseTestCase):
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
index 5801151..accb03d 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -358,6 +358,7 @@ Jonathan Hartley
Larry Hastings
Shane Hathaway
Rycharde Hawkes
+Ben Hayden
Jochen Hayek
Christian Heimes
Thomas Heller
diff --git a/Misc/NEWS b/Misc/NEWS
index 6ab6308..04d4e94 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -91,6 +91,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.