From: Brian Curtin Date: Sat, 30 Oct 2010 21:27:07 +0000 (+0000) Subject: Merged revisions 85987 via svnmerge from X-Git-Tag: v3.1.3rc1~73 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=32105f401d25d195a0668b56140d9fdfae439ca1;p=python Merged revisions 85987 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r85987 | brian.curtin | 2010-10-30 16:24:21 -0500 (Sat, 30 Oct 2010) | 2 lines Fix #10257. Clear resource warnings by using os.popen's context manager. ........ --- diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py index 6134c93c96..9be1aad5ab 100644 --- a/Lib/test/test_os.py +++ b/Lib/test/test_os.py @@ -388,17 +388,19 @@ class EnvironTests(mapping_tests.BasicTestMappingProtocol): os.environ.clear() if os.path.exists("/bin/sh"): os.environ.update(HELLO="World") - value = os.popen("/bin/sh -c 'echo $HELLO'").read().strip() - self.assertEquals(value, "World") + with os.popen("/bin/sh -c 'echo $HELLO'") as popen: + value = popen.read().strip() + self.assertEquals(value, "World") def test_os_popen_iter(self): if os.path.exists("/bin/sh"): - popen = os.popen("/bin/sh -c 'echo \"line1\nline2\nline3\"'") - it = iter(popen) - self.assertEquals(next(it), "line1\n") - self.assertEquals(next(it), "line2\n") - self.assertEquals(next(it), "line3\n") - self.assertRaises(StopIteration, next, it) + with os.popen( + "/bin/sh -c 'echo \"line1\nline2\nline3\"'") as popen: + it = iter(popen) + self.assertEquals(next(it), "line1\n") + self.assertEquals(next(it), "line2\n") + self.assertEquals(next(it), "line3\n") + self.assertRaises(StopIteration, next, it) # Verify environ keys and values from the OS are of the # correct str type.