commit 5f955dfff186afaa64d5549fcae95700a247e50a
author Gavin Mak <gavinmak@google.com> Wed Aug 30 15:39:13 2023 +0000
committer LUCI CQ <infra-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Aug 30 15:39:13 2023 +0000
tree 90dcefa4dcac0cc57e91ee92c6475e580a60c6f0
parent 1c1cc06a0d7be68d4ade7dd697a4f1e154f59e1e

Drop py2 support from metrics files

python3 is the only supported version of python in depot_tools.

Bug: 1475402
Change-Id: Ic925af3a79311b11a953f1d0d4602754488a9de3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4824480
Commit-Queue: Gavin Mak <gavinmak@google.com>
Reviewed-by: Josip Sokcevic <sokcevic@chromium.org>

metrics_utils.py

diff --git a/metrics_utils.py b/metrics_utils.py
index 4af7eb3..931cb38 100644
--- a/metrics_utils.py
+++ b/metrics_utils.py
@@ -10,11 +10,7 @@
 import scm
 import subprocess2
 import sys
-
-try:
-  import urlparse
-except ImportError:  # For Py3 compatibility
-  import urllib.parse as urlparse
+import urllib.parse
 
 
 # Current version of metrics recording.
@@ -265,7 +261,7 @@
   if method in KNOWN_HTTP_METHODS:
     http_metrics['method'] = method
 
-  parsed_url = urlparse.urlparse(request_uri)
+  parsed_url = urllib.parse.urlparse(request_uri)
 
   if parsed_url.netloc in KNOWN_HTTP_HOSTS:
     http_metrics['host'] = parsed_url.netloc
@@ -275,7 +271,7 @@
       http_metrics['path'] = name
       break
 
-  parsed_query = urlparse.parse_qs(parsed_url.query)
+  parsed_query = urllib.parse.parse_qs(parsed_url.query)
 
   # Collect o-parameters from the request.
   args = [