To be on the safe side, backed out any questionable iteritem changes and set back to item calls.
This commit is contained in:
parent
03eaf8b1ae
commit
df0d87a922
|
@ -478,7 +478,7 @@ class ProxyHandler(BaseHandler):
|
||||||
proxies = getproxies()
|
proxies = getproxies()
|
||||||
assert hasattr(proxies, 'has_key'), "proxies must be a mapping"
|
assert hasattr(proxies, 'has_key'), "proxies must be a mapping"
|
||||||
self.proxies = proxies
|
self.proxies = proxies
|
||||||
for type, url in proxies.iteritems():
|
for type, url in proxies.items():
|
||||||
setattr(self, '%s_open' % type,
|
setattr(self, '%s_open' % type,
|
||||||
lambda r, proxy=url, type=type, meth=self.proxy_open: \
|
lambda r, proxy=url, type=type, meth=self.proxy_open: \
|
||||||
meth(r, proxy, type))
|
meth(r, proxy, type))
|
||||||
|
@ -805,7 +805,7 @@ class AbstractHTTPHandler(BaseHandler):
|
||||||
name, value = args
|
name, value = args
|
||||||
if name not in req.headers:
|
if name not in req.headers:
|
||||||
h.putheader(*args)
|
h.putheader(*args)
|
||||||
for k, v in req.headers.iteritems():
|
for k, v in req.headers.items():
|
||||||
h.putheader(k, v)
|
h.putheader(k, v)
|
||||||
# httplib will attempt to connect() here. be prepared
|
# httplib will attempt to connect() here. be prepared
|
||||||
# to convert a socket error to a URLError.
|
# to convert a socket error to a URLError.
|
||||||
|
|
Loading…
Reference in New Issue