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/tests/gclient_scm_test.py b/tests/gclient_scm_test.py
index b7b101f..3f1484f 100755
--- a/tests/gclient_scm_test.py
+++ b/tests/gclient_scm_test.py
@@ -9,33 +9,26 @@
from __future__ import unicode_literals
-
-from subprocess import Popen, PIPE, STDOUT
-
+from io import StringIO
import json
import logging
import os
import re
+from subprocess import Popen, PIPE, STDOUT
import sys
import tempfile
import unittest
+from unittest import mock
-if sys.version_info.major == 2:
- from cStringIO import StringIO
- import mock
-else:
- from io import StringIO
- from unittest import mock
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-from testing_support import fake_repos
-from testing_support import test_case_utils
-
import gclient_scm
import gclient_utils
import git_cache
import subprocess2
+from testing_support import fake_repos
+from testing_support import test_case_utils
GIT = 'git' if sys.platform != 'win32' else 'git.bat'