[Python-checkins] r85491 - in python/branches/release31-maint: Lib/test/test_urllib.py

[antoine.pitrou]

Author: antoine.pitrou
Date: Thu Oct 14 20:40:02 2010
New Revision: 85491

Log:
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
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/test/test_urllib.py

Modified: python/branches/release31-maint/Lib/test/test_urllib.py
==============================================================================
--- python/branches/release31-maint/Lib/test/test_urllib.py	(original)
+++ python/branches/release31-maint/Lib/test/test_urllib.py	Thu Oct 14 20:40:02 2010
@@ -120,8 +120,8 @@
         # 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):