minor fix/update

This commit is contained in:
Miroslav Stampar 2011-01-05 13:32:40 +00:00
parent 7411052456
commit 694a65f6f1
2 changed files with 3 additions and 3 deletions

View File

@ -1829,7 +1829,7 @@ def filterControlChars(value):
Returns string value with control
chars being supstituted with ' '
"""
return filterStringValue(output, NON_CONTROL_CHAR_REGEX, ' ')
return filterStringValue(value, NON_CONTROL_CHAR_REGEX, ' ')
def isDBMSVersionAtLeast(version):
"""

View File

@ -16,7 +16,7 @@ class SmartHTTPBasicAuthHandler(urllib2.HTTPBasicAuthHandler):
"""
def __init__(self, *args, **kwargs):
urllib2.HTTPBasicAuthHandler.__init__(self, *args, **kwargs)
self.retried_req = []
self.retried_req = set()
def reset_retry_count(self):
# Python 2.6.5 will call this on 401 or 407 errors and thus loop
@ -27,7 +27,7 @@ class SmartHTTPBasicAuthHandler(urllib2.HTTPBasicAuthHandler):
def http_error_auth_reqed(self, auth_header, host, req, headers):
# Reset the retry counter once for each request.
if hash(req) not in self.retried_req:
self.retried_req.append(hash(req))
self.retried_req.add(hash(req))
self.retried = 0
return urllib2.HTTPBasicAuthHandler.http_error_auth_reqed(
self, auth_header, host, req, headers)