[Python-checkins] r66992 - python/trunk/Lib/test/test_urllib.py

[benjamin.peterson]

Author: benjamin.peterson
Date: Tue Oct 21 22:51:13 2008
New Revision: 66992

Log:
make sure to call iteritems()

Modified:
   python/trunk/Lib/test/test_urllib.py

Modified: python/trunk/Lib/test/test_urllib.py
==============================================================================
--- python/trunk/Lib/test/test_urllib.py	(original)
+++ python/trunk/Lib/test/test_urllib.py	Tue Oct 21 22:51:13 2008
@@ -98,7 +98,6 @@
 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 @@
             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):