From: Brian Curtin <brian.curtin@gmail.com>
Date: Tue, 2 Nov 2010 04:04:37 +0000 (+0000)
Subject: Merged revisions 86107 via svnmerge from
X-Git-Tag: v2.7.1rc1~68
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a54bf8b006a6723c79e4868c2eb394894c1bf056;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 86107 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86107 | brian.curtin | 2010-11-01 22:59:09 -0500 (Mon, 01 Nov 2010) | 2 lines

  Clean up ResourceWarnings. Explictly close stdout from the subprocess.
........
---

diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py
index 5af74794c29b..21b7a04e2d08 100644
--- a/Lib/test/test_threading.py
+++ b/Lib/test/test_threading.py
@@ -428,6 +428,7 @@ class ThreadJoinOnShutdown(BaseTestCase):
         p = subprocess.Popen([sys.executable, "-c", script], stdout=subprocess.PIPE)
         rc = p.wait()
         data = p.stdout.read().replace('\r', '')
+        p.stdout.close()
         self.assertEqual(data, "end of main\nend of thread\n")
         self.assertFalse(rc == 2, "interpreter was blocked")
         self.assertTrue(rc == 0, "Unexpected error")