Revert "presubmit_support: Fix tests on Python 3."
This reverts commit a834f39e213247945fad24605839e2d3c65b0070.
Reason for revert:
https://bugs.chromium.org/p/chromium/issues/detail?id=1017367
Original change's description:
> presubmit_support: Fix tests on Python 3.
>
> Bug: 1009814
> Change-Id: I2c2a835fc4fa0a7fc9e68dfff680fb0beacb491e
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1869535
> Reviewed-by: Anthony Polito <apolito@google.com>
> Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
TBR=ehmaldonado@chromium.org,apolito@google.com
Bug: 1009814
Change-Id: I48907caeca9b9b32e4e3a7cb5a636280d017a4c3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1877350
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
diff --git a/git_cl.py b/git_cl.py
index 4d9ec1a..0415fd4 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -15,6 +15,7 @@
import collections
import datetime
import glob
+import httplib
import httplib2
import itertools
import json
@@ -29,6 +30,9 @@
import tempfile
import textwrap
import time
+import urllib
+import urllib2
+import urlparse
import uuid
import webbrowser
import zlib
@@ -54,17 +58,6 @@
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
@@ -3189,7 +3182,7 @@
This is necessary because urllib is broken for SSL connections via a proxy.
"""
with open(destination, 'w') as f:
- f.write(urllib_request.urlopen(source).read())
+ f.write(urllib2.urlopen(source).read())
def hasSheBang(fname):
@@ -4662,7 +4655,7 @@
'unknown' or 'unset'."""
url = url or settings.GetTreeStatusUrl(error_ok=True)
if url:
- status = urllib_request.urlopen(url).read().lower()
+ status = urllib2.urlopen(url).read().lower()
if status.find('closed') != -1 or status == '0':
return 'closed'
elif status.find('open') != -1 or status == '1':
@@ -4676,7 +4669,7 @@
with the reason for the tree to be opened or closed."""
url = settings.GetTreeStatusUrl()
json_url = urlparse.urljoin(url, '/current?format=json')
- connection = urllib_request.urlopen(json_url)
+ connection = urllib2.urlopen(json_url)
status = json.loads(connection.read())
connection.close()
return status['message']
@@ -5466,7 +5459,7 @@
return dispatcher.execute(OptionParser(), argv)
except auth.LoginRequiredError as e:
DieWithError(str(e))
- except urllib_error.HTTPError as e:
+ except urllib2.HTTPError as e:
if e.code != 500:
raise
DieWithError(