presubmit_support: Fix tests on Python 3.
The problems on crbug.com/1017367 should have been fixed by crrev.com/c/1880013
Bug: 1009814
Change-Id: Ia98304ca983b4e7e293fedb9df1fee589de58ba9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1887714
Reviewed-by: Anthony Polito <apolito@google.com>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
diff --git a/git_cl.py b/git_cl.py
index b2eef88..398e3eb 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -15,7 +15,6 @@
import collections
import datetime
import glob
-import httplib
import httplib2
import itertools
import json
@@ -30,9 +29,6 @@
import tempfile
import textwrap
import time
-import urllib
-import urllib2
-import urlparse
import uuid
import webbrowser
import zlib
@@ -58,6 +54,17 @@
import subprocess2
import watchlists
+if sys.version_info.major == 2:
+ import httplib
+ import urllib2 as urllib_request
+ import urllib2 as urllib_error
+ import urlparse
+else:
+ import http.client as httplib
+ import urllib.request as urllib_request
+ import urllib.error as urllib_error
+ import urllib.parse as urlparse
+
__version__ = '2.0'
# Traces for git push will be stored in a traces directory inside the
@@ -3186,7 +3193,7 @@
This is necessary because urllib is broken for SSL connections via a proxy.
"""
with open(destination, 'w') as f:
- f.write(urllib2.urlopen(source).read())
+ f.write(urllib_request.urlopen(source).read())
def hasSheBang(fname):
@@ -4659,7 +4666,7 @@
'unknown' or 'unset'."""
url = url or settings.GetTreeStatusUrl(error_ok=True)
if url:
- status = urllib2.urlopen(url).read().lower()
+ status = urllib_request.urlopen(url).read().lower()
if status.find('closed') != -1 or status == '0':
return 'closed'
elif status.find('open') != -1 or status == '1':
@@ -4673,7 +4680,7 @@
with the reason for the tree to be opened or closed."""
url = settings.GetTreeStatusUrl()
json_url = urlparse.urljoin(url, '/current?format=json')
- connection = urllib2.urlopen(json_url)
+ connection = urllib_request.urlopen(json_url)
status = json.loads(connection.read())
connection.close()
return status['message']
@@ -5462,7 +5469,7 @@
return dispatcher.execute(OptionParser(), argv)
except auth.LoginRequiredError as e:
DieWithError(str(e))
- except urllib2.HTTPError as e:
+ except urllib_error.HTTPError as e:
if e.code != 500:
raise
DieWithError(