From 810921b675654fc6560747390eb657fa765d46ba Mon Sep 17 00:00:00 2001 From: Brian Curtin Date: Sat, 30 Oct 2010 21:24:21 +0000 Subject: [PATCH] Fix #10257. Clear resource warnings by using os.popen's context manager. --- Lib/test/test_os.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py index 73261e00b3..b67eed5077 100644 --- a/Lib/test/test_os.py +++ b/Lib/test/test_os.py @@ -406,17 +406,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. -- 2.49.0