Improve gclient Python 3 compatibility
This enables gclient sync and gclient runhooks to run, barring hook script failures.
git cl upload also now works.
The scripts still work with Python 2.
There are no intended behaviour changes.
Bug: 942522
Change-Id: I2ac587b5f803ba7f5bb5e412337ce049f4b1a741
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1524583
Commit-Queue: Raul Tambre <raul@tambre.ee>
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
diff --git a/metrics_utils.py b/metrics_utils.py
index f71ec52..5df124a 100644
--- a/metrics_utils.py
+++ b/metrics_utils.py
@@ -9,7 +9,11 @@
import scm
import subprocess2
import sys
-import urlparse
+
+try:
+ import urlparse
+except ImportError: # For Py3 compatibility
+ import urllib.parse as urlparse
# Current version of metrics recording.
@@ -280,7 +284,7 @@
width = max(min_width, max(len(line) for line in lines))
out(SE + EW * (width + 2) + SW + '\n')
for line in lines:
- out('%s %-*s %s\n' % (NS, width, line, NS))
+ out('%s %-*s %s\n' % (NS, width, line, NS))
out(NE + EW * (width + 2) + NW + '\n')
def print_notice(countdown):