From efafdc7d103c6773621c8d200935939a672a127d Mon Sep 17 00:00:00 2001 From: Senthil Kumaran Date: Tue, 1 Jun 2010 12:56:17 +0000 Subject: Merged revisions 81638 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r81638 | senthil.kumaran | 2010-06-01 18:23:48 +0530 (Tue, 01 Jun 2010) | 9 lines Merged revisions 81636 via svnmerge from 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. ........ ................ --- Lib/test/test_urllib2.py | 1 - Lib/urllib/request.py | 9 +++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py index 2da3bef..9071f49 100644 --- a/Lib/test/test_urllib2.py +++ b/Lib/test/test_urllib2.py @@ -1156,7 +1156,6 @@ class HandlerTests(unittest.TestCase): self.assertEqual(len(http_handler.requests), 1) self.assertFalse(http_handler.requests[0].has_header(auth_header)) - class MiscTests(unittest.TestCase): def test_build_opener(self): diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py index 5440efb..95e8e33 100644 --- a/Lib/urllib/request.py +++ b/Lib/urllib/request.py @@ -775,12 +775,21 @@ class AbstractBasicAuthHandler: password_mgr = HTTPPasswordMgr() self.passwd = password_mgr self.add_password = self.passwd.add_password + self.retried = 0 def http_error_auth_reqed(self, authreq, host, req, headers): # host may be an authority (without userinfo) or a URL with an # authority # XXX could be multiple headers 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: mo = AbstractBasicAuthHandler.rx.search(authreq) if mo: -- cgit v0.12