Drop py2 support in gclient and related files
python3 is the only supported version of python in depot_tools.
Bug: 1475402
Change-Id: I17174d7252b5cbf698700333d3cd561c6591d0a1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4809190
Reviewed-by: Aravind Vasudevan <aravindvasudev@google.com>
Commit-Queue: Gavin Mak <gavinmak@google.com>
Reviewed-by: Josip Sokcevic <sokcevic@chromium.org>
diff --git a/gclient_paths.py b/gclient_paths.py
index d4ea28d..10754eb 100644
--- a/gclient_paths.py
+++ b/gclient_paths.py
@@ -8,14 +8,13 @@
# particularly for modules that are not builtin (see sys.builtin_modules_names,
# os isn't built in, but it's essential to this file).
-from __future__ import print_function
-
-import gclient_utils
import logging
import os
-import subprocess2
import sys
+import gclient_utils
+import subprocess2
+
def FindGclientRoot(from_dir, filename='.gclient'):
"""Tries to find the gclient root."""
@@ -78,8 +77,7 @@
try:
top_dir = subprocess2.check_output(['git', 'rev-parse', '--show-toplevel'],
stderr=subprocess2.DEVNULL)
- if sys.version_info.major == 3:
- top_dir = top_dir.decode('utf-8', 'replace')
+ top_dir = top_dir.decode('utf-8', 'replace')
top_dir = os.path.normpath(top_dir.strip())
except subprocess2.CalledProcessError:
pass