From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 21 Oct 2008 20:51:13 +0000 (+0000)
Subject: make sure to call iteritems()
X-Git-Tag: v2.7a1~2715
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77c2f93663cc7583047d53cf7ecf9d9c5e3ebf7e;p=thirdparty%2FPython%2Fcpython.git

make sure to call iteritems()
---

diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py
index b78f30a13630..c5195788c2e8 100644
--- a/Lib/test/test_urllib.py
+++ b/Lib/test/test_urllib.py
@@ -98,7 +98,6 @@ class urlopen_FileTests(unittest.TestCase):
 class ProxyTests(unittest.TestCase):
 
     def setUp(self):
-        unittest.TestCase.setUp(self)
         # Save all proxy related env vars
         self._saved_environ = dict([(k, v) for k, v in os.environ.iteritems()
                                     if k.lower().find('proxy') >= 0])
@@ -107,9 +106,8 @@ class ProxyTests(unittest.TestCase):
             del os.environ[k]
 
     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):