InTheForest/chromium_depot_tools
1
0
Fork 0
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools.git synced 2026-01-11 18:51:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reland "Drop py2 support in gerrit and git related files"

Browse Source 
This is a reland of commit b5c7f4b46c

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>
This commit is contained in:
Gavin Mak
2023-08-28 17:01:52 +00:00
committed by LUCI CQ
parent b8164180d2
commit cc97655889
32 changed files with 67 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
gerrit_client.py
View File

@@ -9,20 +9,12 @@ Example usage:
./gerrit_client.py [command] [args] ./gerrit_client.py [command] [args]
""" """
from __future__ import print_function
import json import json
import logging import logging
import optparse import optparse
import subcommand import subcommand
import sys import sys
import urllib.parse
if sys.version_info.major == 2:
import urlparse
from urllib import quote_plus
else:
from urllib.parse import quote_plus
import urllib.parse as urlparse
import fix_encoding import fix_encoding
import gerrit_util import gerrit_util
@@ -49,7 +41,7 @@ def CMDmovechanges(parser, args):
assert opt.destination_branch, "--destination_branch not defined" assert opt.destination_branch, "--destination_branch not defined"
for p in opt.params: for p in opt.params:
assert '=' in p, '--param is key=value, not "%s"' % p assert '=' in p, '--param is key=value, not "%s"' % p
host = urlparse.urlparse(opt.host).netloc host = urllib.parse.urlparse(opt.host).netloc
limit = 100 limit = 100
while True: while True:
@@ -72,9 +64,9 @@ def CMDbranchinfo(parser, args):
parser.add_option('--branch', dest='branch', help='branch name') parser.add_option('--branch', dest='branch', help='branch name')
(opt, args) = parser.parse_args(args) (opt, args) = parser.parse_args(args)
host = urlparse.urlparse(opt.host).netloc host = urllib.parse.urlparse(opt.host).netloc
project = quote_plus(opt.project) project = urllib.parse.quote_plus(opt.project)
branch = quote_plus(opt.branch) branch = urllib.parse.quote_plus(opt.branch)
result = gerrit_util.GetGerritBranch(host, project, branch) result = gerrit_util.GetGerritBranch(host, project, branch)
logging.info(result) logging.info(result)
write_result(result, opt) write_result(result, opt)
@@ -94,7 +86,7 @@ def CMDrawapi(parser, args):
(opt, args) = parser.parse_args(args) (opt, args) = parser.parse_args(args)
assert opt.path, "--path not defined" assert opt.path, "--path not defined"
host = urlparse.urlparse(opt.host).netloc host = urllib.parse.urlparse(opt.host).netloc
kwargs = {} kwargs = {}
if opt.method: if opt.method:
kwargs['reqtype'] = opt.method.upper() kwargs['reqtype'] = opt.method.upper()
@@ -122,9 +114,9 @@ def CMDbranch(parser, args):
assert opt.branch, "--branch not defined" assert opt.branch, "--branch not defined"
assert opt.commit, "--commit not defined" assert opt.commit, "--commit not defined"
project = quote_plus(opt.project) project = urllib.parse.quote_plus(opt.project)
host = urlparse.urlparse(opt.host).netloc host = urllib.parse.urlparse(opt.host).netloc
branch = quote_plus(opt.branch) branch = urllib.parse.quote_plus(opt.branch)
result = gerrit_util.GetGerritBranch(host, project, branch) result = gerrit_util.GetGerritBranch(host, project, branch)
if result: if result:
if not opt.allow_existent_branch: if not opt.allow_existent_branch:
@@ -161,9 +153,9 @@ def CMDtag(parser, args):
assert opt.tag, "--tag not defined" assert opt.tag, "--tag not defined"
assert opt.commit, "--commit not defined" assert opt.commit, "--commit not defined"
project = quote_plus(opt.project) project = urllib.parse.quote_plus(opt.project)
host = urlparse.urlparse(opt.host).netloc host = urllib.parse.urlparse(opt.host).netloc
tag = quote_plus(opt.tag) tag = urllib.parse.quote_plus(opt.tag)
result = gerrit_util.CreateGerritTag(host, project, tag, opt.commit) result = gerrit_util.CreateGerritTag(host, project, tag, opt.commit)
logging.info(result) logging.info(result)
write_result(result, opt) write_result(result, opt)
@@ -178,9 +170,9 @@ def CMDhead(parser, args):
assert opt.project, "--project not defined" assert opt.project, "--project not defined"
assert opt.branch, "--branch not defined" assert opt.branch, "--branch not defined"
project = quote_plus(opt.project) project = urllib.parse.quote_plus(opt.project)
host = urlparse.urlparse(opt.host).netloc host = urllib.parse.urlparse(opt.host).netloc
branch = quote_plus(opt.branch) branch = urllib.parse.quote_plus(opt.branch)
result = gerrit_util.UpdateHead(host, project, branch) result = gerrit_util.UpdateHead(host, project, branch)
logging.info(result) logging.info(result)
write_result(result, opt) write_result(result, opt)
@@ -193,8 +185,8 @@ def CMDheadinfo(parser, args):
(opt, args) = parser.parse_args(args) (opt, args) = parser.parse_args(args)
assert opt.project, "--project not defined" assert opt.project, "--project not defined"
project = quote_plus(opt.project) project = urllib.parse.quote_plus(opt.project)
host = urlparse.urlparse(opt.host).netloc host = urllib.parse.urlparse(opt.host).netloc
result = gerrit_util.GetHead(host, project) result = gerrit_util.GetHead(host, project)
logging.info(result) logging.info(result)
write_result(result, opt) write_result(result, opt)
@@ -224,7 +216,7 @@ def CMDchanges(parser, args):
assert '=' in p, '--param is key=value, not "%s"' % p assert '=' in p, '--param is key=value, not "%s"' % p
result = gerrit_util.QueryChanges( result = gerrit_util.QueryChanges(
urlparse.urlparse(opt.host).netloc, urllib.parse.urlparse(opt.host).netloc,
list(tuple(p.split('=', 1)) for p in opt.params), list(tuple(p.split('=', 1)) for p in opt.params),
first_param=opt.query, first_param=opt.query,
start=opt.start, # Default: None start=opt.start, # Default: None
@@ -244,7 +236,7 @@ def CMDrelatedchanges(parser, args):
(opt, args) = parser.parse_args(args) (opt, args) = parser.parse_args(args)
result = gerrit_util.GetRelatedChanges( result = gerrit_util.GetRelatedChanges(
urlparse.urlparse(opt.host).netloc, urllib.parse.urlparse(opt.host).netloc,
change=opt.change, change=opt.change,
revision=opt.revision, revision=opt.revision,
) )
@@ -282,7 +274,7 @@ def CMDcreatechange(parser, args):
params.append(('notify_details', {'CC': {'accounts': opt.cc_list}})) params.append(('notify_details', {'CC': {'accounts': opt.cc_list}}))
result = gerrit_util.CreateChange( result = gerrit_util.CreateChange(
urlparse.urlparse(opt.host).netloc, urllib.parse.urlparse(opt.host).netloc,
opt.project, opt.project,
branch=opt.branch, branch=opt.branch,
subject=opt.subject, subject=opt.subject,
@@ -304,7 +296,7 @@ def CMDchangeedit(parser, args):
with open(opt.file) as f: with open(opt.file) as f:
data = f.read() data = f.read()
result = gerrit_util.ChangeEdit( result = gerrit_util.ChangeEdit(
urlparse.urlparse(opt.host).netloc, opt.change, opt.path, data) urllib.parse.urlparse(opt.host).netloc, opt.change, opt.path, data)
logging.info(result) logging.info(result)
write_result(result, opt) write_result(result, opt)
@@ -318,7 +310,7 @@ def CMDpublishchangeedit(parser, args):
(opt, args) = parser.parse_args(args) (opt, args) = parser.parse_args(args)
result = gerrit_util.PublishChangeEdit( result = gerrit_util.PublishChangeEdit(
urlparse.urlparse(opt.host).netloc, opt.change, opt.notify) urllib.parse.urlparse(opt.host).netloc, opt.change, opt.notify)
logging.info(result) logging.info(result)
write_result(result, opt) write_result(result, opt)
@@ -329,7 +321,7 @@ def CMDsubmitchange(parser, args):
parser.add_option('-c', '--change', type=int, help='change number') parser.add_option('-c', '--change', type=int, help='change number')
(opt, args) = parser.parse_args(args) (opt, args) = parser.parse_args(args)
result = gerrit_util.SubmitChange( result = gerrit_util.SubmitChange(
urlparse.urlparse(opt.host).netloc, opt.change) urllib.parse.urlparse(opt.host).netloc, opt.change)
logging.info(result) logging.info(result)
write_result(result, opt) write_result(result, opt)
@@ -340,7 +332,7 @@ def CMDchangesubmittedtogether(parser, args):
parser.add_option('-c', '--change', type=int, help='change number') parser.add_option('-c', '--change', type=int, help='change number')
(opt, args) = parser.parse_args(args) (opt, args) = parser.parse_args(args)
result = gerrit_util.GetChangesSubmittedTogether( result = gerrit_util.GetChangesSubmittedTogether(
urlparse.urlparse(opt.host).netloc, opt.change) urllib.parse.urlparse(opt.host).netloc, opt.change)
logging.info(result) logging.info(result)
write_result(result, opt) write_result(result, opt)
@@ -351,7 +343,7 @@ def CMDgetcommitincludedin(parser, args):
parser.add_option('--commit', dest='commit', help='commit hash') parser.add_option('--commit', dest='commit', help='commit hash')
(opt, args) = parser.parse_args(args) (opt, args) = parser.parse_args(args)
result = gerrit_util.GetCommitIncludedIn( result = gerrit_util.GetCommitIncludedIn(
urlparse.urlparse(opt.host).netloc, opt.project, opt.commit) urllib.parse.urlparse(opt.host).netloc, opt.project, opt.commit)
logging.info(result) logging.info(result)
write_result(result, opt) write_result(result, opt)
@@ -361,11 +353,10 @@ def CMDsetbotcommit(parser, args):
"""Sets bot-commit+1 to a bot generated change.""" """Sets bot-commit+1 to a bot generated change."""
parser.add_option('-c', '--change', type=int, help='change number') parser.add_option('-c', '--change', type=int, help='change number')
(opt, args) = parser.parse_args(args) (opt, args) = parser.parse_args(args)
result = gerrit_util.SetReview( result = gerrit_util.SetReview(urllib.parse.urlparse(opt.host).netloc,
urlparse.urlparse(opt.host).netloc, opt.change,
opt.change, labels={'Bot-Commit': 1},
labels={'Bot-Commit': 1}, ready=True)
ready=True)
logging.info(result) logging.info(result)
write_result(result, opt) write_result(result, opt)
@@ -379,7 +370,7 @@ def CMDsetlabel(parser, args):
nargs=2, nargs=2,
metavar=('label_name', 'label_value')) metavar=('label_name', 'label_value'))
(opt, args) = parser.parse_args(args) (opt, args) = parser.parse_args(args)
result = gerrit_util.SetReview(urlparse.urlparse(opt.host).netloc, result = gerrit_util.SetReview(urllib.parse.urlparse(opt.host).netloc,
opt.change, opt.change,
labels={opt.label[0]: opt.label[1]}) labels={opt.label[0]: opt.label[1]})
logging.info(result) logging.info(result)
@@ -395,8 +386,7 @@ def CMDabandon(parser, args):
(opt, args) = parser.parse_args(args) (opt, args) = parser.parse_args(args)
assert opt.change, "-c not defined" assert opt.change, "-c not defined"
result = gerrit_util.AbandonChange( result = gerrit_util.AbandonChange(
urlparse.urlparse(opt.host).netloc, urllib.parse.urlparse(opt.host).netloc, opt.change, opt.message)
opt.change, opt.message)
logging.info(result) logging.info(result)
write_result(result, opt) write_result(result, opt)
@@ -439,7 +429,7 @@ def CMDmass_abandon(parser, args):
search_query.append(('status', 'open')) search_query.append(('status', 'open'))
logging.info("Searching for: %s" % search_query) logging.info("Searching for: %s" % search_query)
host = urlparse.urlparse(opt.host).netloc host = urllib.parse.urlparse(opt.host).netloc
result = gerrit_util.QueryChanges( result = gerrit_util.QueryChanges(
host, host,

14
gerrit_util.py
View File

@@ -8,9 +8,6 @@ Utilities for requesting information for a Gerrit server via HTTPS.
https://gerrit-review.googlesource.com/Documentation/rest-api.html https://gerrit-review.googlesource.com/Documentation/rest-api.html
""" """
from __future__ import print_function
from __future__ import unicode_literals
import base64 import base64
import contextlib import contextlib
import httplib2 import httplib2
@@ -33,15 +30,10 @@ import metrics
import metrics_utils import metrics_utils
import subprocess2 import subprocess2
from third_party import six
from six.moves import urllib from six.moves import urllib
if sys.version_info.major == 2: import http.cookiejar
import cookielib from io import StringIO
from StringIO import StringIO
else:
import http.cookiejar as cookielib
from io import StringIO
LOGGER = logging.getLogger() LOGGER = logging.getLogger()
# With a starting sleep time of 12.0 seconds, x <= [1.8-2.2]x backoff, and six # With a starting sleep time of 12.0 seconds, x <= [1.8-2.2]x backoff, and six
@@ -255,7 +247,7 @@ class CookiesAuthenticator(Authenticator):
def _get_auth_for_host(self, host): def _get_auth_for_host(self, host):
for domain, creds in self.gitcookies.items(): for domain, creds in self.gitcookies.items():
if cookielib.domain_match(host, domain): if http.cookiejar.domain_match(host, domain):
return (creds[0], None, creds[1]) return (creds[0], None, creds[1])
return self.netrc.authenticators(host) return self.netrc.authenticators(host)

14
git_cache.py
View File

@@ -5,8 +5,6 @@
"""A git command for managing a local cache of git repositories.""" """A git command for managing a local cache of git repositories."""
from __future__ import print_function
import contextlib import contextlib
import logging import logging
import optparse import optparse
@@ -17,11 +15,7 @@ import sys
import tempfile import tempfile
import threading import threading
import time import time
import urllib.parse
try:
import urlparse
except ImportError: # For Py3 compatibility
import urllib.parse as urlparse
from download_from_google_storage import Gsutil from download_from_google_storage import Gsutil
import gclient_utils import gclient_utils
@@ -141,7 +135,7 @@ class Mirror(object):
b = os.getenv('OVERRIDE_BOOTSTRAP_BUCKET') b = os.getenv('OVERRIDE_BOOTSTRAP_BUCKET')
if b: if b:
return b return b
u = urlparse.urlparse(self.url) u = urllib.parse.urlparse(self.url)
if u.netloc == 'chromium.googlesource.com': if u.netloc == 'chromium.googlesource.com':
return 'chromium-git-cache' return 'chromium-git-cache'
# Not recognized. # Not recognized.
@@ -163,7 +157,7 @@ class Mirror(object):
url = os.path.splitdrive(url)[1] url = os.path.splitdrive(url)[1]
return url.replace('-', '--').replace(os.sep, '-') return url.replace('-', '--').replace(os.sep, '-')
parsed = urlparse.urlparse(url) parsed = urllib.parse.urlparse(url)
norm_url = parsed.netloc + parsed.path norm_url = parsed.netloc + parsed.path
if norm_url.endswith('.git'): if norm_url.endswith('.git'):
norm_url = norm_url[:-len('.git')] norm_url = norm_url[:-len('.git')]
@@ -358,7 +352,7 @@ class Mirror(object):
def supported_project(self): def supported_project(self):
"""Returns true if this repo is known to have a bootstrap zip file.""" """Returns true if this repo is known to have a bootstrap zip file."""
u = urlparse.urlparse(self.url) u = urllib.parse.urlparse(self.url)
return u.netloc in [ return u.netloc in [
'chromium.googlesource.com', 'chromium.googlesource.com',
'chrome-internal.googlesource.com'] 'chrome-internal.googlesource.com']

11
git_cl.py
View File

@@ -7,8 +7,6 @@
"""A git-command for integrating reviews on Gerrit.""" """A git-command for integrating reviews on Gerrit."""
from __future__ import print_function
import base64 import base64
import collections import collections
import datetime import datetime
@@ -55,14 +53,9 @@ import subprocess2
import swift_format import swift_format
import watchlists import watchlists
from third_party import six
from six.moves import urllib from six.moves import urllib
if sys.version_info.major == 3:
basestring = (str,) # pylint: disable=redefined-builtin
__version__ = '2.0' __version__ = '2.0'
# Traces for git push will be stored in a traces directory inside the # Traces for git push will be stored in a traces directory inside the
@@ -922,7 +915,7 @@ def ParseIssueNumberArgument(arg):
if isinstance(arg, int): if isinstance(arg, int):
return _ParsedIssueNumberArgument(issue=arg) return _ParsedIssueNumberArgument(issue=arg)
if not isinstance(arg, basestring): if not isinstance(arg, str):
return fail_result return fail_result
if arg.isdigit(): if arg.isdigit():
@@ -3179,7 +3172,7 @@ class ChangeDescription(object):
return '\n'.join(self._description_lines) return '\n'.join(self._description_lines)
def set_description(self, desc): def set_description(self, desc):
if isinstance(desc, basestring): if isinstance(desc, str):
lines = desc.splitlines() lines = desc.splitlines()
else: else:
lines = [line.rstrip() for line in desc] lines = [line.rstrip() for line in desc]

4
git_common.py
View File

@@ -16,9 +16,7 @@ from third_party import colorama
def wrapper(func): def wrapper(func):
def wrap(self, timeout=None): def wrap(self, timeout=None):
default_timeout = (1 << 31 if sys.version_info.major == 2 else return func(self, timeout=timeout or threading.TIMEOUT_MAX)
threading.TIMEOUT_MAX)
return func(self, timeout=timeout or default_timeout)
return wrap return wrap
IMapIterator.next = wrapper(IMapIterator.next) IMapIterator.next = wrapper(IMapIterator.next)

2
git_drover.py
View File

@@ -3,8 +3,6 @@
# Use of this source code is governed by a BSD-style license that can be # Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. # found in the LICENSE file.
from __future__ import print_function
import argparse import argparse

2
git_find_releases.py
View File

@@ -11,8 +11,6 @@ Note that it uses the "cherry picked from" annotation to find merges, so it will
only work on merges that followed the "use cherry-pick -x" instructions. only work on merges that followed the "use cherry-pick -x" instructions.
""" """
from __future__ import print_function
import optparse import optparse
import re import re
import sys import sys

2
git_footers.py
View File

@@ -3,8 +3,6 @@
# Use of this source code is governed by a BSD-style license that can be # Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. # found in the LICENSE file.
from __future__ import print_function
import argparse import argparse
import json import json
import re import re

3
git_hyper_blame.py
View File

@@ -6,9 +6,6 @@
"""Wrapper around git blame that ignores certain commits. """Wrapper around git blame that ignores certain commits.
""" """
from __future__ import print_function
from __future__ import unicode_literals
import argparse import argparse
import collections import collections
import logging import logging

8
git_map.py
View File

@@ -17,8 +17,6 @@ point to them. Items are colorized as follows:
* Blue background - The currently checked out commit * Blue background - The currently checked out commit
""" """
from __future__ import unicode_literals
import os import os
import sys import sys
@@ -29,12 +27,6 @@ import subprocess2
from third_party import colorama from third_party import colorama
if sys.version_info.major == 2:
# On Python 3, BrokenPipeError is raised instead.
# pylint:disable=redefined-builtin
BrokenPipeError = IOError
RESET = colorama.Fore.RESET + colorama.Back.RESET + colorama.Style.RESET_ALL RESET = colorama.Fore.RESET + colorama.Back.RESET + colorama.Style.RESET_ALL
BRIGHT = colorama.Style.BRIGHT BRIGHT = colorama.Style.BRIGHT

2
git_map_branches.py
View File

@@ -24,8 +24,6 @@ Branches are colorized as follows:
upstream, then you will see this. upstream, then you will see this.
""" """
from __future__ import print_function
import argparse import argparse
import collections import collections
import metrics import metrics

2
git_mark_merge_base.py
View File

@@ -11,8 +11,6 @@ purposes of the chromium depot_tools git extensions. Passing no arguments will
just print the effective merge base for the current branch. just print the effective merge base for the current branch.
""" """
from __future__ import print_function
import argparse import argparse
import sys import sys

2
git_migrate_default_branch.py
View File

@@ -11,7 +11,7 @@ import metrics
import scm import scm
import sys import sys
import logging import logging
from six.moves import urllib import urllib.parse
def GetGerritProject(remote_url): def GetGerritProject(remote_url):

2
git_nav_downstream.py
View File

@@ -9,8 +9,6 @@ is more than one downstream branch, then this script will prompt you to select
which branch. which branch.
""" """
from __future__ import print_function
import argparse import argparse
import sys import sys

13
git_number.py
View File

@@ -21,9 +21,6 @@ commit's entire history, this script caches all calculated data inside the git
repo that it operates on in the ref 'refs/number/commits'. repo that it operates on in the ref 'refs/number/commits'.
""" """
from __future__ import print_function
from __future__ import division
import binascii import binascii
import collections import collections
import logging import logging
@@ -60,10 +57,7 @@ def pathlify(hash_prefix):
>>> pathlify('\xDE\xAD') >>> pathlify('\xDE\xAD')
'de/ad' 'de/ad'
""" """
if sys.version_info.major == 3: return '/'.join('%02x' % b for b in hash_prefix)
return '/'.join('%02x' % b for b in hash_prefix)
return '/'.join('%02x' % ord(b) for b in hash_prefix)
@git.memoize_one(threadsafe=False) @git.memoize_one(threadsafe=False)
@@ -184,10 +178,7 @@ def preload_tree(prefix):
def all_prefixes(depth=PREFIX_LEN): def all_prefixes(depth=PREFIX_LEN):
if sys.version_info.major == 3: prefixes = [bytes([i]) for i in range(255)]
prefixes = [bytes([i]) for i in range(255)]
else:
prefixes = [chr(i) for i in range(255)]
for x in prefixes: for x in prefixes:
# This isn't covered because PREFIX_LEN currently == 1 # This isn't covered because PREFIX_LEN currently == 1
if depth > 1: # pragma: no cover if depth > 1: # pragma: no cover

2
git_rebase_update.py
View File

@@ -7,8 +7,6 @@
Tool to update all branches to have the latest changes from their upstreams. Tool to update all branches to have the latest changes from their upstreams.
""" """
from __future__ import print_function
import argparse import argparse
import collections import collections
import logging import logging

2
git_reparent_branch.py
View File

@@ -5,8 +5,6 @@
"""Change the upstream of the current branch.""" """Change the upstream of the current branch."""
from __future__ import print_function
import argparse import argparse
import sys import sys

2
git_upstream_diff.py
View File

@@ -3,8 +3,6 @@
# Use of this source code is governed by a BSD-style license that can be # Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. # found in the LICENSE file.
from __future__ import print_function
import argparse import argparse
import sys import sys

8
testing_support/git_test_utils.py
View File

@@ -20,10 +20,6 @@ import gclient_utils
DEFAULT_BRANCH = 'main' DEFAULT_BRANCH = 'main'
if sys.version_info.major == 3:
# pylint: disable=redefined-builtin
basestring = (str,)
def git_hash_data(data, typ='blob'): def git_hash_data(data, typ='blob'):
"""Calculate the git-style SHA1 for some data. """Calculate the git-style SHA1 for some data.
@@ -333,7 +329,7 @@ class GitRepo(object):
for fname, file_data in commit_data.items(): for fname, file_data in commit_data.items():
# If it isn't a string, it's one of the special keys. # If it isn't a string, it's one of the special keys.
if not isinstance(fname, basestring): if not isinstance(fname, str):
continue continue
deleted = False deleted = False
@@ -496,8 +492,6 @@ class GitRepoSchemaTestBase(unittest.TestCase):
@classmethod @classmethod
def getRepoContent(cls, commit): def getRepoContent(cls, commit):
commit = 'COMMIT_%s' % commit commit = 'COMMIT_%s' % commit
if sys.version_info.major == 2:
commit = commit.encode('utf-8')
return getattr(cls, commit, None) return getattr(cls, commit, None)
@classmethod @classmethod

13
tests/gerrit_client_test.py
View File

@@ -9,20 +9,11 @@ import logging
import os import os
import sys import sys
import unittest import unittest
from unittest import mock
if sys.version_info.major == 2:
from StringIO import StringIO
import mock
BUILTIN_OPEN = '__builtin__.open'
else:
from io import StringIO
from unittest import mock
BUILTIN_OPEN = 'builtins.open'
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
import gerrit_client import gerrit_client
import gerrit_util
class TestGerritClient(unittest.TestCase): class TestGerritClient(unittest.TestCase):
@@ -120,7 +111,7 @@ class TestGerritClient(unittest.TestCase):
subject='subject', subject='subject',
params=[('work_in_progress', 'true')]) params=[('work_in_progress', 'true')])
@mock.patch(BUILTIN_OPEN, mock.mock_open()) @mock.patch('builtins.open', mock.mock_open())
@mock.patch('gerrit_util.ChangeEdit', return_value='') @mock.patch('gerrit_util.ChangeEdit', return_value='')
def test_changeedit(self, util_mock): def test_changeedit(self, util_mock):
open().read.return_value = 'test_data' open().read.return_value = 'test_data'

16
tests/gerrit_util_test.py
View File

@@ -4,31 +4,19 @@
# Use of this source code is governed by a BSD-style license that can be # Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. # found in the LICENSE file.
from __future__ import print_function
from __future__ import unicode_literals
import base64
import httplib2 import httplib2
from io import StringIO
import json import json
import os import os
import socket import socket
import sys import sys
import unittest 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__)))) sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
import gerrit_util import gerrit_util
import gclient_utils
import metrics import metrics
import metrics_utils
import subprocess2 import subprocess2

9
tests/git_cache_test.py
View File

@@ -5,6 +5,7 @@
"""Unit tests for git_cache.py""" """Unit tests for git_cache.py"""
from io import StringIO
import logging import logging
import os import os
import shutil import shutil
@@ -12,13 +13,7 @@ import subprocess
import sys import sys
import tempfile import tempfile
import unittest import unittest
from unittest import mock
if sys.version_info.major == 2:
from StringIO import StringIO
import mock
else:
from io import StringIO
from unittest import mock
DEPOT_TOOLS_ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) DEPOT_TOOLS_ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
sys.path.insert(0, DEPOT_TOOLS_ROOT) sys.path.insert(0, DEPOT_TOOLS_ROOT)

13
tests/git_cl_test.py
View File

@@ -6,27 +6,18 @@
"""Unit tests for git_cl.py.""" """Unit tests for git_cl.py."""
from __future__ import print_function
from __future__ import unicode_literals
import datetime import datetime
import json import json
import logging import logging
from io import StringIO
import multiprocessing import multiprocessing
import optparse import optparse
import os import os
import pprint
import shutil import shutil
import sys import sys
import tempfile import tempfile
import unittest import unittest
from unittest import mock
if sys.version_info.major == 2:
from StringIO 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__)))) sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))

3
tests/git_common_test.py
View File

@@ -6,9 +6,6 @@
"""Unit tests for git_common.py""" """Unit tests for git_common.py"""
from __future__ import print_function
from __future__ import unicode_literals
import binascii import binascii
import collections import collections
import datetime import datetime

13
tests/git_find_releases_test.py
View File

@@ -5,25 +5,16 @@
# found in the LICENSE file. # found in the LICENSE file.
"""Unit tests for git_find_releases.py.""" """Unit tests for git_find_releases.py."""
from __future__ import print_function from io import StringIO
from __future__ import unicode_literals
import logging import logging
import os import os
import sys import sys
import unittest import unittest
from unittest import mock
if sys.version_info.major == 2:
from StringIO 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__)))) sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
import git_find_releases import git_find_releases
import git_common
class TestGitFindReleases(unittest.TestCase): class TestGitFindReleases(unittest.TestCase):

10
tests/git_footers_test.py
View File

@@ -2,18 +2,12 @@
"""Tests for git_footers.""" """Tests for git_footers."""
from io import StringIO
import json import json
import os import os
import sys import sys
import tempfile
import unittest import unittest
from unittest import mock
if sys.version_info.major == 2:
from StringIO 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__)))) sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))

51
tests/git_hyper_blame_test.py
View File

@@ -4,23 +4,13 @@
# found in the LICENSE file. # found in the LICENSE file.
"""Tests for git_dates.""" """Tests for git_dates."""
from __future__ import unicode_literals from io import BytesIO, StringIO
import datetime
import os import os
import re import re
import shutil import shutil
import sys import sys
import tempfile import tempfile
import unittest from unittest import mock
from io import BytesIO
if sys.version_info.major == 2:
from StringIO import StringIO
import mock
else:
from io import StringIO
from unittest import mock
DEPOT_TOOLS_ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) DEPOT_TOOLS_ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
sys.path.insert(0, DEPOT_TOOLS_ROOT) sys.path.insert(0, DEPOT_TOOLS_ROOT)
@@ -29,7 +19,6 @@ from testing_support import coverage_utils
from testing_support import git_test_utils from testing_support import git_test_utils
import gclient_utils import gclient_utils
import git_common
GitRepo = git_test_utils.GitRepo GitRepo = git_test_utils.GitRepo
@@ -590,11 +579,7 @@ class GitHyperBlameUnicodeTest(GitHyperBlameTestBase):
# Add a line. # Add a line.
COMMIT_B = { COMMIT_B = {
# AUTHOR_NAME has .encode('utf-8') for py2 as Windows raises exception GitRepo.AUTHOR_NAME: '\u4e2d\u56fd\u4f5c\u8005',
# otherwise. Type remains str
GitRepo.AUTHOR_NAME:
('\u4e2d\u56fd\u4f5c\u8005'.encode('utf-8')
if sys.version_info.major == 2 else '\u4e2d\u56fd\u4f5c\u8005'),
'file': { 'file': {
'data': b'red\ngreen\nblue\n' 'data': b'red\ngreen\nblue\n'
}, },
@@ -602,40 +587,12 @@ class GitHyperBlameUnicodeTest(GitHyperBlameTestBase):
# Modify a line with non-UTF-8 author and file text. # Modify a line with non-UTF-8 author and file text.
COMMIT_C = { COMMIT_C = {
GitRepo.AUTHOR_NAME: GitRepo.AUTHOR_NAME: 'Lat\xedn-1 Author',
('Lat\u00edn-1 Author'.encode('latin-1')
if sys.version_info.major == 2 else 'Lat\xedn-1 Author'),
'file': { 'file': {
'data': 'red\ngre\u00e9n\nblue\n'.encode('latin-1') 'data': 'red\ngre\u00e9n\nblue\n'.encode('latin-1')
}, },
} }
@unittest.skipIf(
sys.platform.startswith("win") and sys.version_info.major == 2,
"Known issue for Windows and py2")
def testNonASCIIAuthorName(self):
"""Ensures correct tabulation.
Tests the case where there are non-ASCII (UTF-8) characters in the author
name.
Regression test for https://crbug.com/808905.
This test is disabled only for Windows and Python2 as `author` gets escaped
differently.
"""
# Known issue with Windows and py2, skip test for such env
expected_output = [
self.blame_line('A', '1) red', author='ASCII Author'),
# Expect 8 spaces, to line up with the other name.
self.blame_line(
'B', '2) green', author='\u4e2d\u56fd\u4f5c\u8005 '),
self.blame_line('A', '3) blue', author='ASCII Author'),
]
retval, output = self.run_hyperblame([], 'file', 'tag_B')
self.assertEqual(0, retval)
self.assertEqual(expected_output, output)
def testNonUTF8Data(self): def testNonUTF8Data(self):
"""Ensures correct behaviour even if author or file data is not UTF-8. """Ensures correct behaviour even if author or file data is not UTF-8.

11
tests/git_map_test.py
View File

@@ -5,14 +5,12 @@
# found in the LICENSE file. # found in the LICENSE file.
"""Tests for git_map.""" """Tests for git_map."""
from __future__ import print_function
from __future__ import unicode_literals
import io import io
import os import os
import re import re
import sys import sys
import unittest import unittest
from unittest import mock
DEPOT_TOOLS_ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) DEPOT_TOOLS_ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
sys.path.insert(0, DEPOT_TOOLS_ROOT) sys.path.insert(0, DEPOT_TOOLS_ROOT)
@@ -22,11 +20,6 @@ from testing_support import git_test_utils
import git_map import git_map
import git_common import git_common
if sys.version_info.major == 2:
import mock
else:
from unittest import mock
git_common.TEST_MODE = True git_common.TEST_MODE = True
GitRepo = git_test_utils.GitRepo GitRepo = git_test_utils.GitRepo
@@ -111,7 +104,7 @@ class GitMapTest(git_test_utils.GitRepoReadOnlyTestBase):
'* 315457dbe8 (tag_B) 1970-01-04 ~ B', '* 315457dbe8 (tag_B) 1970-01-04 ~ B',
'* cd589e62d8 (tag_A, origin/root_A) 1970-01-02 ~ A', '* cd589e62d8 (tag_A, origin/root_A) 1970-01-02 ~ A',
'* 7026d3d68e (tag_", root_", main, branch_") 1970-01-02 ~ "', '* 7026d3d68e (tag_", root_", main, branch_") 1970-01-02 ~ "',
]) ])
outbuf = io.BytesIO() outbuf = io.BytesIO()
self.repo.run(git_map.main, [], outbuf) self.repo.run(git_map.main, [], outbuf)
output = outbuf.getvalue() output = outbuf.getvalue()

6
tests/git_migrate_default_branch_test.py
View File

@@ -8,11 +8,7 @@ import collections
import os import os
import sys import sys
import unittest import unittest
from unittest import mock
if sys.version_info.major == 2:
import mock
else:
from unittest import mock
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))

3
tests/git_rebase_update_test.py
View File

@@ -5,9 +5,6 @@
"""Unit tests for git_rebase_update.py""" """Unit tests for git_rebase_update.py"""
from __future__ import print_function
from __future__ import unicode_literals
import os import os
import sys import sys

8
tests/owners_client_test.py
View File

@@ -6,19 +6,13 @@
import os import os
import sys import sys
import unittest import unittest
from unittest import mock
if sys.version_info.major == 2:
import mock
else:
from unittest import mock
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
import gerrit_util import gerrit_util
import owners_client import owners_client
from testing_support import filesystem_mock
alice = 'alice@example.com' alice = 'alice@example.com'
bob = 'bob@example.com' bob = 'bob@example.com'

6
tests/owners_finder_test.py
View File

@@ -8,11 +8,7 @@
import os import os
import sys import sys
import unittest import unittest
from unittest import mock
if sys.version_info.major == 2:
import mock
else:
from unittest import mock
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))