Merged revisions 86202 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86202 | brian.curtin | 2010-11-05 10:40:27 -0500 (Fri, 05 Nov 2010) | 2 lines

  Fix ResourceWarning from subprocess pipes being left open.
........

diff --git a/Lib/test/test_quopri.py b/Lib/test/test_quopri.py
index 406e5fc6625ea1d36a0bc292519d1b028f1263dc..c3c4d1432e80b3fa93708e27a57c8718da3c8ce7 100644 (file)
--- a/Lib/test/test_quopri.py
+++ b/Lib/test/test_quopri.py
@@ -178,6 +178,7 @@ zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz''')
         (p, e) = self.STRINGS[-1]
         process = subprocess.Popen([sys.executable, "-mquopri"],
                                    stdin=subprocess.PIPE, stdout=subprocess.PIPE)
+        self.addCleanup(process.stdout.close)
         cout, cerr = process.communicate(p)
         # On Windows, Python will output the result to stdout using
         # CRLF, as the mode of stdout is text mode. To compare this
@@ -188,6 +189,7 @@ zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz''')
         (p, e) = self.STRINGS[-1]
         process = subprocess.Popen([sys.executable, "-mquopri", "-d"],
                                    stdin=subprocess.PIPE, stdout=subprocess.PIPE)
+        self.addCleanup(process.stdout.close)
         cout, cerr = process.communicate(e)
         self.assertEqual(cout.splitlines(), p.splitlines())