summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Lagerwall <rosslagerwall@gmail.com>2011-03-26 19:21:46 (GMT)
committerRoss Lagerwall <rosslagerwall@gmail.com>2011-03-26 19:21:46 (GMT)
commit17ace7a07c4fe23afc25383799aa184dbb707f14 (patch)
tree8d9c99222116a1b38a8939c86cf013c4662cfe26
parentd8f2d50c204442d0dfafcc29db3177d15abb41df (diff)
parentb8a5769a6d35931f4dc5395686f590b5dcb58cdd (diff)
downloadcpython-17ace7a07c4fe23afc25383799aa184dbb707f14.zip
cpython-17ace7a07c4fe23afc25383799aa184dbb707f14.tar.gz
cpython-17ace7a07c4fe23afc25383799aa184dbb707f14.tar.bz2
Merge with 3.1
-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 01e670e..7ca3d92 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -1226,6 +1226,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 f2bf3cd..9747ae7 100644
--- 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
index 5958a32..4638fd7 100644
--- 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.