diff -r e999ed2192ef -r ec12ebe20200 mercurial/url.py --- a/mercurial/url.py Thu Oct 15 17:19:11 2015 -0400 +++ b/mercurial/url.py Thu Oct 15 17:21:08 2015 -0400 @@ -419,17 +419,8 @@ if req is not self.retried_req: self.retried_req = req self.retried = 0 - # In python < 2.5 AbstractDigestAuthHandler raises a ValueError if - # it doesn't know about the auth type requested. This can happen if - # somebody is using BasicAuth and types a bad password. - try: - return urllib2.HTTPDigestAuthHandler.http_error_auth_reqed( - self, auth_header, host, req, headers) - except ValueError as inst: - arg = inst.args[0] - if arg.startswith("AbstractDigestAuthHandler doesn't know "): - return - raise + return urllib2.HTTPDigestAuthHandler.http_error_auth_reqed( + self, auth_header, host, req, headers) class httpbasicauthhandler(urllib2.HTTPBasicAuthHandler): def __init__(self, *args, **kwargs):