From: Brett Cannon Date: Sun, 18 May 2003 02:25:07 +0000 (+0000) Subject: To be on the safe side, backed out any questionable iteritem changes and set back... X-Git-Tag: v2.3c1~677 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=df0d87a922ea29f7a410e8b634ae8730caa4438e;p=python To be on the safe side, backed out any questionable iteritem changes and set back to item calls. --- diff --git a/Lib/urllib2.py b/Lib/urllib2.py index cf6a80546c..c64b7c10ec 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.