mirror of
https://gerrit.googlesource.com/git-repo
synced 2024-12-21 07:16:21 +00:00
handle binary stream from urllib.request.urlopen
Python 3 returns bytes by default with urlopen. Adjust our code to handle that scenario and decode as necessary. Bug: https://crbug.com/gerrit/10418 Change-Id: Icf4cd80e7ef92d71a3eefbc6113f1ba11c32eebc
This commit is contained in:
parent
3698ab7c92
commit
1b9adab75a
@ -657,13 +657,14 @@ class Remote(object):
|
||||
info = urllib.request.urlopen(info_url, context=context).read()
|
||||
else:
|
||||
info = urllib.request.urlopen(info_url).read()
|
||||
if info == 'NOT_AVAILABLE' or '<' in info:
|
||||
if info == b'NOT_AVAILABLE' or b'<' in info:
|
||||
# If `info` contains '<', we assume the server gave us some sort
|
||||
# of HTML response back, like maybe a login page.
|
||||
#
|
||||
# Assume HTTP if SSH is not enabled or ssh_info doesn't look right.
|
||||
self._review_url = http_url
|
||||
else:
|
||||
info = info.decode('utf-8')
|
||||
host, port = info.split()
|
||||
self._review_url = self._SshReviewUrl(userEmail, host, port)
|
||||
except urllib.error.HTTPError as e:
|
||||
|
Loading…
Reference in New Issue
Block a user