From df5ee52050a5b8ea4e0bb69c007dac556c18ec03 Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Tue, 11 Oct 2011 14:05:21 -0700 Subject: Fix Python 2.4 support Change-Id: I89521ae52fa564f0d849cc51e71fee65b3c47bab Signed-off-by: Shawn O. Pearce --- main.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'main.py') diff --git a/main.py b/main.py index 22e6fa42..fda81038 100755 --- a/main.py +++ b/main.py @@ -276,10 +276,17 @@ class _UserAgentHandler(urllib2.BaseHandler): class _BasicAuthHandler(urllib2.HTTPBasicAuthHandler): def http_error_auth_reqed(self, authreq, host, req, headers): try: + old_add_header = req.add_header + def _add_header(name, val): + val = val.replace('\n', '') + old_add_header(name, val) + req.add_header = _add_header return urllib2.AbstractBasicAuthHandler.http_error_auth_reqed( self, authreq, host, req, headers) except: - self.reset_retry_count() + reset = getattr(self, 'reset_retry_count', None) + if reset is not None: + reset() raise def init_http(): -- cgit v1.2.3-54-g00ecf