Reland "Drop py2 support in gerrit and git related files"
This is a reland of commit b5c7f4b46c3309d46e1796bce7fa83388af9bfd8
Original change's description:
> Drop py2 support in gerrit and git related files
>
> python3 is the only supported version of python in depot_tools.
>
> Bug: 1475402
> Change-Id: Ie4ee18d297081b3aa0206b8d7ce6461819bff0ca
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4809560
> Reviewed-by: Josip Sokcevic <sokcevic@chromium.org>
> Commit-Queue: Gavin Mak <gavinmak@google.com>
Bug: 1475402
Change-Id: I194180494071777b7b9dd91a5c8edabbbf5484c1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4811218
Reviewed-by: Joanna Wang <jojwang@chromium.org>
Commit-Queue: Gavin Mak <gavinmak@google.com>
diff --git a/git_cl.py b/git_cl.py
index 0b2d34f..00bedb4 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -7,8 +7,6 @@
"""A git-command for integrating reviews on Gerrit."""
-from __future__ import print_function
-
import base64
import collections
import datetime
@@ -55,14 +53,9 @@
import swift_format
import watchlists
-from third_party import six
from six.moves import urllib
-if sys.version_info.major == 3:
- basestring = (str,) # pylint: disable=redefined-builtin
-
-
__version__ = '2.0'
# Traces for git push will be stored in a traces directory inside the
@@ -922,7 +915,7 @@
if isinstance(arg, int):
return _ParsedIssueNumberArgument(issue=arg)
- if not isinstance(arg, basestring):
+ if not isinstance(arg, str):
return fail_result
if arg.isdigit():
@@ -3179,7 +3172,7 @@
return '\n'.join(self._description_lines)
def set_description(self, desc):
- if isinstance(desc, basestring):
+ if isinstance(desc, str):
lines = desc.splitlines()
else:
lines = [line.rstrip() for line in desc]