mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-19 23:20:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merged revisions 81636 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81636 | senthil.kumaran | 2010-06-01 18:10:07 +0530 (Tue, 01 Jun 2010) | 3 lines

  Fix Issue8797 - urllib2 basic authentication fix for wrong passwords. It fails after 5 retries.
........
This commit is contained in:
Senthil Kumaran 2010-06-01 12:53:48 +00:00
parent d35251dc19
commit f4998acb5a
2 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Lib/test/test_urllib2.py
View file

@ -1151,7 +1151,6 @@ class HandlerTests(unittest.TestCase):
self.assertEqual(len(http_handler.requests), 1) self.assertEqual(len(http_handler.requests), 1)
self.assertFalse(http_handler.requests[0].has_header(auth_header)) self.assertFalse(http_handler.requests[0].has_header(auth_header))
class MiscTests(unittest.TestCase): class MiscTests(unittest.TestCase):
def test_build_opener(self): def test_build_opener(self):

9
Lib/urllib/request.py
View file

@ -775,12 +775,21 @@ class AbstractBasicAuthHandler:
password_mgr = HTTPPasswordMgr() password_mgr = HTTPPasswordMgr()
self.passwd = password_mgr self.passwd = password_mgr
self.add_password = self.passwd.add_password self.add_password = self.passwd.add_password
self.retried = 0
def http_error_auth_reqed(self, authreq, host, req, headers): def http_error_auth_reqed(self, authreq, host, req, headers):
# host may be an authority (without userinfo) or a URL with an # host may be an authority (without userinfo) or a URL with an
# authority # authority
# XXX could be multiple headers # XXX could be multiple headers
authreq = headers.get(authreq, None) authreq = headers.get(authreq, None)
if self.retried > 5:
# retry sending the username:password 5 times before failing.
raise HTTPError(req.get_full_url(), 401, "basic auth failed",
headers, None)
else:
self.retried += 1
if authreq: if authreq:
mo = AbstractBasicAuthHandler.rx.search(authreq) mo = AbstractBasicAuthHandler.rx.search(authreq)
if mo: if mo: