[Python-checkins] r84211 - in python/branches/release31-maint: Lib/urllib/request.py
senthil.kumaran
python-checkins at python.org
Thu Aug 19 19:54:34 CEST 2010
Author: senthil.kumaran
Date: Thu Aug 19 19:54:33 2010
New Revision: 84211
Log:
Merged revisions 84210 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r84210 | senthil.kumaran | 2010-08-19 23:20:31 +0530 (Thu, 19 Aug 2010) | 3 lines
Fix Issue9639 - reset the retry count on successful auth.
........
Modified:
python/branches/release31-maint/ (props changed)
python/branches/release31-maint/Lib/urllib/request.py
Modified: python/branches/release31-maint/Lib/urllib/request.py
==============================================================================
--- python/branches/release31-maint/Lib/urllib/request.py (original)
+++ python/branches/release31-maint/Lib/urllib/request.py Thu Aug 19 19:54:33 2010
@@ -778,6 +778,9 @@
self.add_password = self.passwd.add_password
self.retried = 0
+ def reset_retry_count(self):
+ 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
@@ -817,8 +820,10 @@
def http_error_401(self, req, fp, code, msg, headers):
url = req.full_url
- return self.http_error_auth_reqed('www-authenticate',
+ response = self.http_error_auth_reqed('www-authenticate',
url, req, headers)
+ self.reset_retry_count()
+ return response
class ProxyBasicAuthHandler(AbstractBasicAuthHandler, BaseHandler):
@@ -831,8 +836,10 @@
# should not, RFC 3986 s. 3.2.1) support requests for URLs containing
# userinfo.
authority = req.host
- return self.http_error_auth_reqed('proxy-authenticate',
+ response = self.http_error_auth_reqed('proxy-authenticate',
authority, req, headers)
+ self.reset_retry_count()
+ return response
def randombytes(n):
More information about the Python-checkins
mailing list