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.
........

diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py
index 3f781988f5a4f33cacf2166d19018f3b3d00a4ac..43d7c3dd55175c61b7bb6555edd5a8238879e825 100644 (file)
--- a/Lib/test/test_urllib2.py
+++ b/Lib/test/test_urllib2.py
@@ -1145,7 +1145,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/urllib2.py b/Lib/urllib2.py
index 24296895149961884e622edcb823a684ba6cf926..7cfbc1fdc9299553b36bb051eff363fb697ac5ab 100644 (file)
--- a/Lib/urllib2.py
+++ b/Lib/urllib2.py
@@ -819,12 +819,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: