mirror of https://github.com/Mikaela/Limnoria.git
utils/web.py: Fix compatibility with Python 3.
This commit is contained in:
parent
cca1e6dba5
commit
774158f2ec
|
@ -117,8 +117,13 @@ def getUrlFd(url, headers=None, data=None):
|
||||||
url = scheme + '://' + url
|
url = scheme + '://' + url
|
||||||
request = urllib2.Request(url, headers=headers, data=data)
|
request = urllib2.Request(url, headers=headers, data=data)
|
||||||
if 'auth' in locals():
|
if 'auth' in locals():
|
||||||
|
if sys.version_info[0] >= 3 and isinstance(auth, str):
|
||||||
|
auth = auth.encode()
|
||||||
|
auth = base64.b64encode(auth)
|
||||||
|
if sys.version_info[0] >= 3:
|
||||||
|
auth = auth.decode()
|
||||||
request.add_header('Authorization',
|
request.add_header('Authorization',
|
||||||
'Basic ' + base64.b64encode(auth))
|
'Basic ' + auth)
|
||||||
else:
|
else:
|
||||||
request = url
|
request = url
|
||||||
request.add_data(data)
|
request.add_data(data)
|
||||||
|
@ -212,3 +217,4 @@ def mungeEmail(s):
|
||||||
|
|
||||||
# vim:set shiftwidth=4 softtabstop=4 expandtab textwidth=79:
|
# vim:set shiftwidth=4 softtabstop=4 expandtab textwidth=79:
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue