From: Serhiy Storchaka <storchaka@gmail.com>
Date: Wed, 16 Apr 2025 10:05:54 +0000 (+0300)
Subject: gh-127591: Fix altering environment in test_urllib2 (unsetting no_proxy) (GH-132584)
X-Git-Tag: v3.14.0b1~458
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b7cb947c5046d8fb32aad532048de87e09ed3f9;p=thirdparty%2FPython%2Fcpython.git

gh-127591: Fix altering environment in test_urllib2 (unsetting no_proxy) (GH-132584)
---

diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py
index b1229607c516..7d7f2fa00d35 100644
--- a/Lib/test/test_urllib2.py
+++ b/Lib/test/test_urllib2.py
@@ -1446,7 +1446,8 @@ class HandlerTests(unittest.TestCase):
                              [tup[0:2] for tup in o.calls])
 
     def test_proxy_no_proxy(self):
-        os.environ['no_proxy'] = 'python.org'
+        env = self.enterContext(os_helper.EnvironmentVarGuard())
+        env['no_proxy'] = 'python.org'
         o = OpenerDirector()
         ph = urllib.request.ProxyHandler(dict(http="proxy.example.com"))
         o.add_handler(ph)
@@ -1458,10 +1459,10 @@ class HandlerTests(unittest.TestCase):
         self.assertEqual(req.host, "www.python.org")
         o.open(req)
         self.assertEqual(req.host, "www.python.org")
-        del os.environ['no_proxy']
 
     def test_proxy_no_proxy_all(self):
-        os.environ['no_proxy'] = '*'
+        env = self.enterContext(os_helper.EnvironmentVarGuard())
+        env['no_proxy'] = '*'
         o = OpenerDirector()
         ph = urllib.request.ProxyHandler(dict(http="proxy.example.com"))
         o.add_handler(ph)
@@ -1469,7 +1470,6 @@ class HandlerTests(unittest.TestCase):
         self.assertEqual(req.host, "www.python.org")
         o.open(req)
         self.assertEqual(req.host, "www.python.org")
-        del os.environ['no_proxy']
 
     def test_proxy_https(self):
         o = OpenerDirector()