branch merge 3.2

a1051639 · Senthil Kumaran · 875abc06 · 11af4755 · a1051639
Commit a1051639 authored Mar 20, 2011 by Senthil Kumaran
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

Lib/test/test_urllib.py Lib/test/test_urllib.py +5 -2

No files found.
--- a/Lib/test/test_urllib.py
+++ b/Lib/test/test_urllib.py
@@ -176,8 +176,11 @@ class urlopen_HttpTests(unittest.TestCase):

    def test_willclose(self):
        self.fakehttp(b"HTTP/1.1 200 OK\r\n\r\nHello!")
-        resp = urlopen("http://www.python.org")
-        self.assertTrue(resp.fp.will_close)
+        try:
+            resp = urlopen("http://www.python.org")
+            self.assertTrue(resp.fp.will_close)
+        finally:
+            self.unfakehttp()

    def test_read_0_9(self):
        # "0.9" response accepted (but not "simple responses" without