mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-04 16:43:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Fix SF bug [ #447370 ] typo in urllib2.py

Browse source 
Also fix another bug caught by pychecker-- HTTPError() raised when
redirect limit exceed did not pass an fp object.  Had to change method
to keep fp object around until it's certain that the error won't be
raised.

Remove useless line in do_proxy().
This commit is contained in:
Jeremy Hylton 2001-08-07 21:12:25 +00:00
parent 16fd3381d4
commit 54e99e8b3b
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Lib/urllib2.py
View file

@ -436,9 +436,6 @@ class HTTPRedirectHandler(BaseHandler):
newurl = headers['uri'] newurl = headers['uri']
else: else:
return return
nil = fp.read()
fp.close()
newurl = urlparse.urljoin(req.get_full_url(), newurl) newurl = urlparse.urljoin(req.get_full_url(), newurl)
# XXX Probably want to forget about the state of the current # XXX Probably want to forget about the state of the current
@ -450,9 +447,15 @@ class HTTPRedirectHandler(BaseHandler):
if len(req.error_302_dict)>10 or \ if len(req.error_302_dict)>10 or \
req.error_302_dict.has_key(newurl): req.error_302_dict.has_key(newurl):
raise HTTPError(req.get_full_url(), code, raise HTTPError(req.get_full_url(), code,
self.inf_msg + msg, headers) self.inf_msg + msg, headers, fp)
new.error_302_dict.update(req.error_302_dict) new.error_302_dict.update(req.error_302_dict)
new.error_302_dict[newurl] = newurl new.error_302_dict[newurl] = newurl
# Don't close the fp until we are sure that we won't use it
# with HTTPError.
fp.read()
fp.close()
return self.parent.open(new) return self.parent.open(new)
http_error_301 = http_error_302 http_error_301 = http_error_302
@ -525,7 +528,6 @@ class CustomProxyHandler(BaseHandler):
return None return None
def do_proxy(self, p, req): def do_proxy(self, p, req):
p
return self.parent.open(req) return self.parent.open(req)
def add_proxy(self, cpo): def add_proxy(self, cpo):
@ -659,7 +661,7 @@ class AbstractDigestAuthHandler:
def __init__(self, passwd=None): def __init__(self, passwd=None):
if passwd is None: if passwd is None:
passwd = HTTPPassowrdMgr() passwd = HTTPPasswordMgr()
self.passwd = passwd self.passwd = passwd
self.add_password = self.passwd.add_password self.add_password = self.passwd.add_password
self.__current_realm = None self.__current_realm = None
@ -1051,7 +1053,7 @@ class OpenerFactory:
pass pass
def build_opener(self): def build_opener(self):
opener = OpenerDirectory() opener = OpenerDirector()
for ph in self.proxy_handlers: for ph in self.proxy_handlers:
if type(ph) == types.ClassType: if type(ph) == types.ClassType:
ph = ph() ph = ph()