From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Wed, 16 Apr 2025 11:06:53 +0000 (+0200)
Subject: [3.13] gh-127591: Fix altering environment in test_urllib2 (unsetting no_proxy) ... 
X-Git-Tag: v3.13.4~266
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8128bcfa08c97e05362d463f446e524519db464c;p=thirdparty%2FPython%2Fcpython.git

[3.13] gh-127591: Fix altering environment in test_urllib2 (unsetting no_proxy) (GH-132584) (GH-132585)

(cherry picked from commit 8b7cb947c5046d8fb32aad532048de87e09ed3f9)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
---

diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py
index 229cb9d97412..9ceba05a6e35 100644
--- a/Lib/test/test_urllib2.py
+++ b/Lib/test/test_urllib2.py
@@ -1432,7 +1432,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)
@@ -1444,10 +1445,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)
@@ -1455,7 +1456,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()