]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Cleanup this test's modification of os.environ in teardown (this already
authorGregory P. Smith <greg@krypto.org>
Mon, 18 Nov 2013 21:10:04 +0000 (21:10 +0000)
committerGregory P. Smith <greg@krypto.org>
Mon, 18 Nov 2013 21:10:04 +0000 (21:10 +0000)
exists in 3.4 but apparently wasn't done for 3.3).

Lib/test/test_urllib2_localnet.py

index b1aa1584553c835136445979eda7e6567d1321f1..9112e5062b1c6b4f28c7b18325f0f28ae1a49a5d 100644 (file)
@@ -353,12 +353,15 @@ class TestUrlopen(unittest.TestCase):
     def setUp(self):
         super(TestUrlopen, self).setUp()
         # Ignore proxies for localhost tests.
+        self.old_environ = os.environ.copy()
         os.environ['NO_PROXY'] = '*'
         self.server = None
 
     def tearDown(self):
         if self.server is not None:
             self.server.stop()
+        os.environ.clear()
+        os.environ.update(self.old_environ)
         super(TestUrlopen, self).tearDown()
 
     def urlopen(self, url, data=None, **kwargs):