--- old/test_urllib.py 2008-10-21 11:15:03.000000000 -0400 +++ new/test_urllib.py 2008-10-21 11:15:31.000000000 -0400 @@ -109,7 +109,7 @@ def tearDown(self): unittest.TestCase.tearDown(self) # Restore all proxy related env vars - for k, v in self._saved_environ: + for k, v in self._saved_environ.iteritems(): os.environ[k] = v def test_getproxies_environment_keep_no_proxies(self):