Further Python2/3 compatibility

More places had python3 problems, address those areas.

Change-Id: Id0b648c2764f8c039e96ae3adbe2f64400e7355e
This commit is contained in:
Jarrod Johnson
2019-10-03 14:43:59 -04:00
parent 1fe80e7960
commit 8f16d9bdf5
6 changed files with 55 additions and 53 deletions

View File

@@ -139,6 +139,10 @@ class SecureHTTPConnection(httplib.HTTPConnection, object):
self.stdheaders[key] = value
def set_basic_credentials(self, username, password):
if isinstance(username, bytes) and not isinstance(username, str):
username = username.decode('utf-8')
if isinstance(password, bytes) and not isinstance(password, str):
password = password.decode('utf-8')
authinfo = ':'.join((username, password))
if not isinstance(authinfo, bytes):
authinfo = authinfo.encode('utf-8')