summaryrefslogtreecommitdiffstats
path: root/Lib/test
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2008-10-21 20:51:13 (GMT)
committerBenjamin Peterson <benjamin@python.org>2008-10-21 20:51:13 (GMT)
commit77c2f93663cc7583047d53cf7ecf9d9c5e3ebf7e (patch)
tree29c2ca131be13d521c388e2d2a413df2c67397de /Lib/test
parent015c84b389c7fa12e0a38dcbad0e0c5a00556658 (diff)
downloadcpython-77c2f93663cc7583047d53cf7ecf9d9c5e3ebf7e.zip
cpython-77c2f93663cc7583047d53cf7ecf9d9c5e3ebf7e.tar.gz
cpython-77c2f93663cc7583047d53cf7ecf9d9c5e3ebf7e.tar.bz2
make sure to call iteritems()
Diffstat (limited to 'Lib/test')
-rw-r--r--Lib/test/test_urllib.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py
index b78f30a..c519578 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):