Index: Lib/test/test_os.py
===================================================================
--- Lib/test/test_os.py	(revision 85983)
+++ Lib/test/test_os.py	(working copy)
@@ -406,8 +406,9 @@
 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"):
@@ -417,6 +418,7 @@
 self.assertEquals(next(it), "line2\n")
 self.assertEquals(next(it), "line3\n")
 self.assertRaises(StopIteration, next, it)
+ popen.close()
 
 # Verify environ keys and values from the OS are of the
 # correct str type.
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://bugs.python.org/file19437/test_os_fd_leak.patch">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://bugs.python.org/file19437/test_os_fd_leak.patch" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>