summaryrefslogtreecommitdiffstats
path: root/Lib/urllib2.py
diff options
context:
space:
mode:
authorBrett Cannon <bcannon@gmail.com>2003-05-18 02:25:07 (GMT)
committerBrett Cannon <bcannon@gmail.com>2003-05-18 02:25:07 (GMT)
commitdf0d87a922ea29f7a410e8b634ae8730caa4438e (patch)
tree1202c792bae1204c4ea47e4aa2aeff66381db681 /Lib/urllib2.py
parent03eaf8b1aec995809a5a486948bef6f24b8174f4 (diff)
downloadcpython-df0d87a922ea29f7a410e8b634ae8730caa4438e.zip
cpython-df0d87a922ea29f7a410e8b634ae8730caa4438e.tar.gz
cpython-df0d87a922ea29f7a410e8b634ae8730caa4438e.tar.bz2
To be on the safe side, backed out any questionable iteritem changes and set back to item calls.
Diffstat (limited to 'Lib/urllib2.py')
-rw-r--r--Lib/urllib2.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/urllib2.py b/Lib/urllib2.py
index cf6a805..c64b7c1 100644
--- a/Lib/urllib2.py
+++ b/Lib/urllib2.py
@@ -478,7 +478,7 @@ class ProxyHandler(BaseHandler):
proxies = getproxies()
assert hasattr(proxies, 'has_key'), "proxies must be a mapping"
self.proxies = proxies
- for type, url in proxies.iteritems():
+ for type, url in proxies.items():
setattr(self, '%s_open' % type,
lambda r, proxy=url, type=type, meth=self.proxy_open: \
meth(r, proxy, type))
@@ -805,7 +805,7 @@ class AbstractHTTPHandler(BaseHandler):
name, value = args
if name not in req.headers:
h.putheader(*args)
- for k, v in req.headers.iteritems():
+ for k, v in req.headers.items():
h.putheader(k, v)
# httplib will attempt to connect() here. be prepared
# to convert a socket error to a URLError.