fix env in test_urllib

Author: graingert

Lib/test/test_urllib.py

@@ -419,7 +419,11 @@ def test_read_bogus(self):
 Content-Type: text/html; charset=iso-8859-1
 ''', mock_close=True)
         try:
-            self.assertRaises(OSError, urllib.request.urlopen, "http://python.org/")
+            with self.assertRaises(OSError) as exc_info:
+                with urllib.request.urlopen("http://python.org/"):
+                    pass
+            with exc_info.exception:
+                pass
         finally:
             self.unfakehttp()
 
@@ -434,8 +438,11 @@ def test_invalid_redirect(self):
 ''', mock_close=True)
         try:
             msg = "Redirection to url 'file:"
-            with self.assertRaisesRegex(urllib.error.HTTPError, msg):
-                urllib.request.urlopen("http://python.org/")
+            with self.assertRaisesRegex(urllib.error.HTTPError, msg) as exc_info:
+                with urllib.request.urlopen("http://python.org/"):
+                    pass
+            with exc_info.exception:
+                pass
         finally:
             self.unfakehttp()
 
@@ -448,8 +455,11 @@ def test_redirect_limit_independent(self):
 Connection: close
 ''', mock_close=True)
             try:
-                self.assertRaises(urllib.error.HTTPError, urllib.request.urlopen,
-                    "http://something")
+                with self.assertRaises(urllib.error.HTTPError) as exc_info:
+                    with urllib.request.urlopen("http://something"):
+                        pass
+                with exc_info.exception:
+                    pass
             finally:
                 self.unfakehttp()
 
@@ -529,10 +539,10 @@ def setUp(self):
             "QOjdAAAAAXNSR0IArs4c6QAAAA9JREFUCNdj%0AYGBg%2BP//PwAGAQL%2BCm8 "
             "vHgAAAABJRU5ErkJggg%3D%3D%0A%20")
 
-        self.text_url_resp = urllib.request.urlopen(self.text_url)
-        self.text_url_base64_resp = urllib.request.urlopen(
-            self.text_url_base64)
-        self.image_url_resp = urllib.request.urlopen(self.image_url)
+        self.text_url_resp = self.enterContext(urllib.request.urlopen(self.text_url))
+        self.text_url_base64_resp = self.enterContext(urllib.request.urlopen(
+            self.text_url_base64))
+        self.image_url_resp = self.enterContext(urllib.request.urlopen(self.image_url))
 
     def test_interface(self):
         # Make sure object returned by urlopen() has the specified methods