[Python-checkins] cpython (merge 3.1 -> 3.2): Merge with 3.1

[ross.lagerwall]

http://hg.python.org/cpython/rev/72f6f5a29e7a
changeset:   68981:72f6f5a29e7a
branch:      3.2
parent:      68977:423b50086b67
parent:      68980:bd46aef7cf10
user:        Ross Lagerwall <rosslagerwall at gmail.com>
date:        Sat Mar 26 21:21:46 2011 +0200
summary:
  Merge with 3.1

files:
  Lib/test/test_subprocess.py |  1 +
  Misc/ACKS                   |  1 +
  Misc/NEWS                   |  3 +++
  3 files changed, 5 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -1226,6 +1226,7 @@
                              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
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -354,6 +354,7 @@
 Larry Hastings
 Shane Hathaway
 Rycharde Hawkes
+Ben Hayden
 Jochen Hayek
 Christian Heimes
 Thomas Heller
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -53,6 +53,9 @@
 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.
 

-- 
Repository URL: http://hg.python.org/cpython