summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-10-14 18:40:02 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-10-14 18:40:02 (GMT)
commitf8827aeb1591d2c4de49967cf1f11f698665a701 (patch)
treea2598f9f8bdc6c9b09b80c83367cb485b83e1723
parente0f214a54912e428f378d1ef38b725a013b16990 (diff)
downloadcpython-f8827aeb1591d2c4de49967cf1f11f698665a701.zip
cpython-f8827aeb1591d2c4de49967cf1f11f698665a701.tar.gz
cpython-f8827aeb1591d2c4de49967cf1f11f698665a701.tar.bz2
Merged revisions 85489-85490 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r85489 | antoine.pitrou | 2010-10-14 20:31:39 +0200 (jeu., 14 oct. 2010) | 3 lines Really fix bug ........ r85490 | antoine.pitrou | 2010-10-14 20:32:54 +0200 (jeu., 14 oct. 2010) | 3 lines Oops ........
-rw-r--r--Lib/test/test_urllib.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py
index 13aa7b3..2a9590a 100644
--- a/Lib/test/test_urllib.py
+++ b/Lib/test/test_urllib.py
@@ -120,8 +120,8 @@ class ProxyTests(unittest.TestCase):
# Records changes to env vars
self.env = support.EnvironmentVarGuard()
# Delete all proxy related env vars
- for k in os.environ.keys():
- if k == 'NO_PROXY':
+ for k in list(os.environ):
+ if 'proxy' in k.lower():
self.env.unset(k)
def tearDown(self):