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

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):