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 73261e0..b67eed5 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -406,17 +406,19 @@
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.