libv8 7.3.492.27.0 → 8.4.255.0

data/vendor/depot_tools/gerrit_client.py

@@ -16,17 +16,19 @@ import logging
 import optparse
 import subcommand
 import sys
-import urllib
-import urlparse
 
-from third_party import colorama
+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 gerrit_util
 import setup_color
 
 __version__ = '0.1'
-# Shortcut since it quickly becomes redundant.
-Fore = colorama.Fore
 
 
 def write_result(result, opt):
@@ -41,23 +43,27 @@ def CMDbranchinfo(parser, args):
 
   (opt, args) = parser.parse_args(args)
   host = urlparse.urlparse(opt.host).netloc
-  project = urllib.quote_plus(opt.project)
-  branch = urllib.quote_plus(opt.branch)
+  project = quote_plus(opt.project)
+  branch = quote_plus(opt.branch)
   result = gerrit_util.GetGerritBranch(host, project, branch)
   logging.info(result)
   write_result(result, opt)
 
+
 @subcommand.usage('[args ...]')
 def CMDbranch(parser, args):
   parser.add_option('--branch', dest='branch', help='branch name')
   parser.add_option('--commit', dest='commit', help='commit hash')
 
   (opt, args) = parser.parse_args(args)
+  assert opt.project, "--project not defined"
+  assert opt.branch, "--branch not defined"
+  assert opt.commit, "--commit not defined"
 
-  project = urllib.quote_plus(opt.project)
+  project = quote_plus(opt.project)
   host = urlparse.urlparse(opt.host).netloc
-  branch = urllib.quote_plus(opt.branch)
-  commit = urllib.quote_plus(opt.commit)
+  branch = quote_plus(opt.branch)
+  commit = quote_plus(opt.commit)
   result = gerrit_util.CreateGerritBranch(host, project, branch, commit)
   logging.info(result)
   write_result(result, opt)
@@ -94,6 +100,7 @@ def CMDabandon(parser, args):
   parser.add_option('-m', '--message', default='', help='reason for abandoning')
 
   (opt, args) = parser.parse_args(args)
+  assert opt.change, "-c not defined"
   result = gerrit_util.AbandonChange(
       urlparse.urlparse(opt.host).netloc,
       opt.change, opt.message)
@@ -104,8 +111,7 @@ def CMDabandon(parser, args):
 class OptionParser(optparse.OptionParser):
   """Creates the option parse and add --verbose support."""
   def __init__(self, *args, **kwargs):
-    optparse.OptionParser.__init__(
-        self, *args, prog='git cl', version=__version__, **kwargs)
+    optparse.OptionParser.__init__(self, *args, version=__version__, **kwargs)
     self.add_option(
         '--verbose', action='count', default=0,
         help='Use 2 times for more debugging info')
@@ -116,6 +122,8 @@ class OptionParser(optparse.OptionParser):
 
   def parse_args(self, args=None, values=None):
     options, args = optparse.OptionParser.parse_args(self, args, values)
+    # Host is always required
+    assert options.host, "--host not defined."
     levels = [logging.WARNING, logging.INFO, logging.DEBUG]
     logging.basicConfig(level=levels[min(options.verbose, len(levels) - 1)])
     return options, args
@@ -124,7 +132,7 @@ class OptionParser(optparse.OptionParser):
 def main(argv):
   if sys.hexversion < 0x02060000:
     print('\nYour python version %s is unsupported, please upgrade.\n'
-          %(sys.version.split(' ', 1)[0],),
+          % (sys.version.split(' ', 1)[0],),
           file=sys.stderr)
     return 2
   dispatcher = subcommand.CommandDispatcher(__name__)

data/vendor/depot_tools/gerrit_util.py

@@ -3,15 +3,17 @@
 # found in the LICENSE file.
 
 """
-Utilities for requesting information for a gerrit server via https.
+Utilities for requesting information for a Gerrit server via HTTPS.
 
 https://gerrit-review.googlesource.com/Documentation/rest-api.html
 """
 
+from __future__ import print_function
+from __future__ import unicode_literals
+
 import base64
 import contextlib
-import cookielib
-import httplib  # Still used for its constants.
+import httplib2
 import json
 import logging
 import netrc
@@ -23,9 +25,6 @@ import stat
 import sys
 import tempfile
 import time
-import urllib
-import urlparse
-from cStringIO import StringIO
 from multiprocessing.pool import ThreadPool
 
 import auth
@@ -33,30 +32,48 @@ import gclient_utils
 import metrics
 import metrics_utils
 import subprocess2
-from third_party import httplib2
 
-LOGGER = logging.getLogger()
-# With a starting sleep time of 1.5 seconds, 2^n exponential backoff, and seven
-# total tries, the sleep time between the first and last tries will be 94.5 sec.
-# TODO(crbug.com/881860): Lower this when crbug.com/877717 is fixed.
-TRY_LIMIT = 7
+from third_party import six
+from six.moves import urllib
 
+if sys.version_info.major == 2:
+  import cookielib
+  from StringIO import StringIO
+else:
+  import http.cookiejar as cookielib
+  from io import StringIO
 
-# Controls the transport protocol used to communicate with gerrit.
+LOGGER = logging.getLogger()
+# With a starting sleep time of 10.0 seconds, x <= [1.8-2.2]x backoff, and five
+# total tries, the sleep time between the first and last tries will be ~7 min.
+TRY_LIMIT = 5
+SLEEP_TIME = 10.0
+MAX_BACKOFF = 2.2
+MIN_BACKOFF = 1.8
+
+# Controls the transport protocol used to communicate with Gerrit.
 # This is parameterized primarily to enable GerritTestCase.
 GERRIT_PROTOCOL = 'https'
 
 
+def time_sleep(seconds):
+  # Use this so that it can be mocked in tests without interfering with python
+  # system machinery.
+  return time.sleep(seconds)
+
+
+def time_time():
+  # Use this so that it can be mocked in tests without interfering with python
+  # system machinery.
+  return time.time()
+
+
 class GerritError(Exception):
   """Exception class for errors commuicating with the gerrit-on-borg service."""
-  def __init__(self, http_status, *args, **kwargs):
+  def __init__(self, http_status, message, *args, **kwargs):
     super(GerritError, self).__init__(*args, **kwargs)
     self.http_status = http_status
-    self.message = '(%d) %s' % (self.http_status, self.message)
-
-
-class GerritAuthenticationError(GerritError):
-  """Exception class for authentication errors during Gerrit communication."""
+    self.message = '(%d) %s' % (self.http_status, message)
 
 
 def _QueryString(params, first_param=None):
@@ -64,21 +81,11 @@ def _QueryString(params, first_param=None):
 
   https://gerrit-review.googlesource.com/Documentation/rest-api-changes.html#list-changes
   """
-  q = [urllib.quote(first_param)] if first_param else []
+  q = [urllib.parse.quote(first_param)] if first_param else []
   q.extend(['%s:%s' % (key, val) for key, val in params])
   return '+'.join(q)
 
 
-def GetConnectionObject(protocol=None):
-  if protocol is None:
-    protocol = GERRIT_PROTOCOL
-  if protocol in ('http', 'https'):
-    return httplib2.Http()
-  else:
-    raise RuntimeError(
-        "Don't know how to work with protocol '%s'" % protocol)
-
-
 class Authenticator(object):
   """Base authenticator class for authenticator implementations to subclass."""
 
@@ -96,6 +103,8 @@ class Authenticator(object):
     # which then must use it.
     if LuciContextAuthenticator.is_luci():
       return LuciContextAuthenticator()
+    # TODO(crbug.com/1059384): Automatically detect when running on cloudtop,
+    # and use CookiesAuthenticator instead.
     if GceAuthenticator.is_gce():
       return GceAuthenticator()
     return CookiesAuthenticator()
@@ -141,15 +150,10 @@ class CookiesAuthenticator(Authenticator):
   @classmethod
   def get_new_password_message(cls, host):
     if host is None:
-      return ('Git host for gerrit upload is unknown. Check your remote '
+      return ('Git host for Gerrit upload is unknown. Check your remote '
               'and the branch your branch is tracking. This tool assumes '
               'that you are using a git server at *.googlesource.com.')
-    assert not host.startswith('http')
-    # Assume *.googlesource.com pattern.
-    parts = host.split('.')
-    if not parts[0].endswith('-review'):
-      parts[0] += '-review'
-    url = 'https://%s/new-password' % ('.'.join(parts))
+    url = cls.get_new_password_url(host)
     return 'You can (re)generate your credentials by visiting %s' % url
 
   @classmethod
@@ -166,10 +170,10 @@ class CookiesAuthenticator(Authenticator):
 
     st = os.stat(path)
     if st.st_mode & (stat.S_IRWXG | stat.S_IRWXO):
-      print >> sys.stderr, (
+      print(
           'WARNING: netrc file %s cannot be used because its file '
           'permissions are insecure.  netrc file permissions should be '
-          '600.' % path)
+          '600.' % path, file=sys.stderr)
     with open(path) as fd:
       content = fd.read()
 
@@ -189,11 +193,11 @@ class CookiesAuthenticator(Authenticator):
     try:
       return netrc.netrc(path)
     except IOError:
-      print >> sys.stderr, 'WARNING: Could not read netrc file %s' % path
+      print('WARNING: Could not read netrc file %s' % path, file=sys.stderr)
       return netrc.netrc(os.devnull)
     except netrc.NetrcParseError as e:
-      print >> sys.stderr, ('ERROR: Cannot use netrc file %s due to a '
-                            'parsing error: %s' % (path, e))
+      print('ERROR: Cannot use netrc file %s due to a parsing error: %s' %
+          (path, e), file=sys.stderr)
       return netrc.netrc(os.devnull)
 
   @classmethod
@@ -201,10 +205,11 @@ class CookiesAuthenticator(Authenticator):
     if os.getenv('GIT_COOKIES_PATH'):
       return os.getenv('GIT_COOKIES_PATH')
     try:
-      return subprocess2.check_output(
-          ['git', 'config', '--path', 'http.cookiefile']).strip()
+      path = subprocess2.check_output(
+          ['git', 'config', '--path', 'http.cookiefile'])
+      return path.decode('utf-8', 'ignore').strip()
     except subprocess2.CalledProcessError:
-      return os.path.join(os.environ['HOME'], '.gitcookies')
+      return os.path.expanduser(os.path.join('~', '.gitcookies'))
 
   @classmethod
   def _get_gitcookies(cls):
@@ -214,29 +219,28 @@ class CookiesAuthenticator(Authenticator):
       return gitcookies
 
     try:
-      f = open(path, 'rb')
+      f = gclient_utils.FileRead(path, 'rb').splitlines()
     except IOError:
       return gitcookies
 
-    with f:
-      for line in f:
-        try:
-          fields = line.strip().split('\t')
-          if line.strip().startswith('#') or len(fields) != 7:
-            continue
-          domain, xpath, key, value = fields[0], fields[2], fields[5], fields[6]
-          if xpath == '/' and key == 'o':
-            if value.startswith('git-'):
-              login, secret_token = value.split('=', 1)
-              gitcookies[domain] = (login, secret_token)
-            else:
-              gitcookies[domain] = ('', value)
-        except (IndexError, ValueError, TypeError) as exc:
-          LOGGER.warning(exc)
+    for line in f:
+      try:
+        fields = line.strip().split('\t')
+        if line.strip().startswith('#') or len(fields) != 7:
+          continue
+        domain, xpath, key, value = fields[0], fields[2], fields[5], fields[6]
+        if xpath == '/' and key == 'o':
+          if value.startswith('git-'):
+            login, secret_token = value.split('=', 1)
+            gitcookies[domain] = (login, secret_token)
+          else:
+            gitcookies[domain] = ('', value)
+      except (IndexError, ValueError, TypeError) as exc:
+        LOGGER.warning(exc)
     return gitcookies
 
   def _get_auth_for_host(self, host):
-    for domain, creds in self.gitcookies.iteritems():
+    for domain, creds in self.gitcookies.items():
       if cookielib.domain_match(host, domain):
         return (creds[0], None, creds[1])
     return self.netrc.authenticators(host)
@@ -245,7 +249,8 @@ class CookiesAuthenticator(Authenticator):
     a = self._get_auth_for_host(host)
     if a:
       if a[0]:
-        return 'Basic %s' % (base64.b64encode('%s:%s' % (a[0], a[2])))
+        secret = base64.b64encode(('%s:%s' % (a[0], a[2])).encode('utf-8'))
+        return 'Basic %s' % secret.decode('utf-8')
       else:
         return 'Bearer %s' % a[2]
     return None
@@ -292,23 +297,26 @@ class GceAuthenticator(Authenticator):
   @classmethod
   def _test_is_gce(cls):
     # Based on https://cloud.google.com/compute/docs/metadata#runninggce
-    try:
-      resp, _ = cls._get(cls._INFO_URL)
-    except (socket.error, httplib2.ServerNotFoundError,
-            httplib2.socks.HTTPError):
-      # Could not resolve URL.
+    resp, _ = cls._get(cls._INFO_URL)
+    if resp is None:
       return False
     return resp.get('metadata-flavor') == 'Google'
 
   @staticmethod
   def _get(url, **kwargs):
-    next_delay_sec = 1
-    for i in xrange(TRY_LIMIT):
-      p = urlparse.urlparse(url)
-      c = GetConnectionObject(protocol=p.scheme)
-      resp, contents = c.request(url, 'GET', **kwargs)
+    next_delay_sec = 1.0
+    for i in range(TRY_LIMIT):
+      p = urllib.parse.urlparse(url)
+      if p.scheme not in ('http', 'https'):
+        raise RuntimeError(
+            "Don't know how to work with protocol '%s'" % protocol)
+      try:
+        resp, contents = httplib2.Http().request(url, 'GET', **kwargs)
+      except (socket.error, httplib2.HttpLib2Error) as e:
+        LOGGER.debug('GET [%s] raised %s', url, e)
+        return None, None
       LOGGER.debug('GET [%s] #%d/%d (%d)', url, i+1, TRY_LIMIT, resp.status)
-      if resp.status < httplib.INTERNAL_SERVER_ERROR:
+      if resp.status < 500:
         return (resp, contents)
 
       # Retry server error status codes.
@@ -316,22 +324,21 @@ class GceAuthenticator(Authenticator):
       if TRY_LIMIT - i > 1:
         LOGGER.info('Will retry in %d seconds (%d more times)...',
                     next_delay_sec, TRY_LIMIT - i - 1)
-        time.sleep(next_delay_sec)
-        next_delay_sec *= 2
-
+        time_sleep(next_delay_sec)
+        next_delay_sec *= random.uniform(MIN_BACKOFF, MAX_BACKOFF)
+    return None, None
 
   @classmethod
   def _get_token_dict(cls):
-    if cls._token_cache:
-      # If it expires within 25 seconds, refresh.
-      if cls._token_expiration < time.time() - 25:
-        return cls._token_cache
+    # If cached token is valid for at least 25 seconds, return it.
+    if cls._token_cache and time_time() + 25 < cls._token_expiration:
+      return cls._token_cache
 
     resp, contents = cls._get(cls._ACQUIRE_URL, headers=cls._ACQUIRE_HEADERS)
-    if resp.status != httplib.OK:
+    if resp is None or resp.status != 200:
       return None
     cls._token_cache = json.loads(contents)
-    cls._token_expiration = cls._token_cache['expires_in'] + time.time()
+    cls._token_expiration = cls._token_cache['expires_in'] + time_time()
     return cls._token_cache
 
   def get_auth_header(self, _host):
@@ -350,25 +357,25 @@ class LuciContextAuthenticator(Authenticator):
     return auth.has_luci_context_local_auth()
 
   def __init__(self):
-    self._access_token = None
-    self._ensure_fresh()
-
-  def _ensure_fresh(self):
-    if not self._access_token or self._access_token.needs_refresh():
-      self._access_token = auth.get_luci_context_access_token(
-          scopes=' '.join([auth.OAUTH_SCOPE_EMAIL, auth.OAUTH_SCOPE_GERRIT]))
+    self._authenticator = auth.Authenticator(
+        ' '.join([auth.OAUTH_SCOPE_EMAIL, auth.OAUTH_SCOPE_GERRIT]))
 
   def get_auth_header(self, _host):
-    self._ensure_fresh()
-    return 'Bearer %s' % self._access_token.token
+    return 'Bearer %s' % self._authenticator.get_access_token().token
 
 
 def CreateHttpConn(host, path, reqtype='GET', headers=None, body=None):
-  """Opens an https connection to a gerrit service, and sends a request."""
+  """Opens an HTTPS connection to a Gerrit service, and sends a request."""
   headers = headers or {}
   bare_host = host.partition(':')[0]
 
-  a = Authenticator.get().get_auth_header(bare_host)
+  a = Authenticator.get()
+  # TODO(crbug.com/1059384): Automatically detect when running on cloudtop.
+  if isinstance(a, GceAuthenticator):
+    print('If you\'re on a cloudtop instance, export '
+          'SKIP_GCE_AUTH_FOR_GIT=1 in your env.')
+
+  a = a.get_auth_header(bare_host)
   if a:
     headers.setdefault('Authorization', a)
   else:
@@ -381,22 +388,22 @@ def CreateHttpConn(host, path, reqtype='GET', headers=None, body=None):
     url = '/a%s' % url
 
   if body:
-    body = json.JSONEncoder().encode(body)
+    body = json.dumps(body, sort_keys=True)
     headers.setdefault('Content-Type', 'application/json')
   if LOGGER.isEnabledFor(logging.DEBUG):
     LOGGER.debug('%s %s://%s%s' % (reqtype, GERRIT_PROTOCOL, host, url))
-    for key, val in headers.iteritems():
+    for key, val in headers.items():
       if key == 'Authorization':
         val = 'HIDDEN'
       LOGGER.debug('%s: %s' % (key, val))
     if body:
       LOGGER.debug(body)
-  conn = GetConnectionObject()
-  # HACK: httplib.Http has no such attribute; we store req_host here for later
+  conn = httplib2.Http()
+  # HACK: httplib2.Http has no such attribute; we store req_host here for later
   # use in ReadHttpResponse.
   conn.req_host = host
   conn.req_params = {
-      'uri': urlparse.urljoin('%s://%s' % (GERRIT_PROTOCOL, host), url),
+      'uri': urllib.parse.urljoin('%s://%s' % (GERRIT_PROTOCOL, host), url),
       'method': reqtype,
       'headers': headers,
       'body': body,
@@ -405,7 +412,7 @@ def CreateHttpConn(host, path, reqtype='GET', headers=None, body=None):
 
 
 def ReadHttpResponse(conn, accept_statuses=frozenset([200])):
-  """Reads an http response from a connection into a string buffer.
+  """Reads an HTTP response from a connection into a string buffer.
 
   Args:
     conn: An Http object created by CreateHttpConn above.
@@ -413,10 +420,11 @@ def ReadHttpResponse(conn, accept_statuses=frozenset([200])):
                      Common additions include 204, 400, and 404.
   Returns: A string buffer containing the connection's reply.
   """
-  sleep_time = 1.5
+  sleep_time = SLEEP_TIME
   for idx in range(TRY_LIMIT):
     before_response = time.time()
     response, contents = conn.request(**conn.req_params)
+    contents = contents.decode('utf-8', 'replace')
 
     response_time = time.time() - before_response
     metrics.collector.add_repeated(
@@ -425,29 +433,22 @@ def ReadHttpResponse(conn, accept_statuses=frozenset([200])):
             conn.req_params['uri'], conn.req_params['method'], response.status,
             response_time))
 
-    # Check if this is an authentication issue.
-    www_authenticate = response.get('www-authenticate')
-    if (response.status in (httplib.UNAUTHORIZED, httplib.FOUND) and
-        www_authenticate):
-      auth_match = re.search('realm="([^"]+)"', www_authenticate, re.I)
-      host = auth_match.group(1) if auth_match else conn.req_host
-      reason = ('Authentication failed. Please make sure your .gitcookies file '
-                'has credentials for %s' % host)
-      raise GerritAuthenticationError(response.status, reason)
-
-    # If response.status < 500 then the result is final; break retry loop.
-    # If the response is 404/409, it might be because of replication lag, so
-    # keep trying anyway.
-    if ((response.status < 500 and response.status not in [404, 409])
-        or response.status in accept_statuses):
+    # If response.status is an accepted status,
+    # or response.status < 500 then the result is final; break retry loop.
+    # If the response is 404/409 it might be because of replication lag,
+    # so keep trying anyway. If it is 429, it is generally ok to retry after
+    # a backoff.
+    if (response.status in accept_statuses
+        or response.status < 500 and response.status not in [404, 409, 429]):
       LOGGER.debug('got response %d for %s %s', response.status,
                    conn.req_params['method'], conn.req_params['uri'])
       # If 404 was in accept_statuses, then it's expected that the file might
-      # not exist, so don't return the gitiles error page because that's not the
-      # "content" that was actually requested.
+      # not exist, so don't return the gitiles error page because that's not
+      # the "content" that was actually requested.
       if response.status == 404:
         contents = ''
       break
+
     # A status >=500 is assumed to be a possible transient error; retry.
     http_version = 'HTTP/%s' % ('1.1' if response.version == 11 else '1.0')
     LOGGER.warn('A transient error occurred while querying %s:\n'
@@ -456,30 +457,30 @@ def ReadHttpResponse(conn, accept_statuses=frozenset([200])):
                 conn.req_host, conn.req_params['method'],
                 conn.req_params['uri'],
                 http_version, http_version, response.status, response.reason)
-    if response.status == 404:
-      # TODO(crbug/881860): remove this hack.
-      # HACK: try different Gerrit mirror as a workaround for potentially
-      # out-of-date mirror hit through default routing.
-      if conn.req_host == 'chromium-review.googlesource.com':
-        conn.req_params['uri'] = _UseGerritMirror(
-            conn.req_params['uri'], 'chromium-review.googlesource.com')
-        # And don't increase sleep_time in this case, since we suspect we've
-        # just asked wrong git mirror before.
-        sleep_time /= 2.0
-
-    if TRY_LIMIT - idx > 1:
+
+    if idx < TRY_LIMIT - 1:
       LOGGER.info('Will retry in %d seconds (%d more times)...',
                   sleep_time, TRY_LIMIT - idx - 1)
-      time.sleep(sleep_time)
-      sleep_time = sleep_time * 2
+      time_sleep(sleep_time)
+      sleep_time *= random.uniform(MIN_BACKOFF, MAX_BACKOFF)
   # end of retries loop
-  if response.status not in accept_statuses:
-    if response.status in (401, 403):
-      print('Your Gerrit credentials might be misconfigured. Try: \n'
-            '  git cl creds-check')
-    reason = '%s: %s' % (response.reason, contents)
-    raise GerritError(response.status, reason)
-  return StringIO(contents)
+
+  if response.status in accept_statuses:
+    return StringIO(contents)
+
+  if response.status in (302, 401, 403):
+    www_authenticate = response.get('www-authenticate')
+    if not www_authenticate:
+      print('Your Gerrit credentials might be misconfigured.')
+    else:
+      auth_match = re.search('realm="([^"]+)"', www_authenticate, re.I)
+      host = auth_match.group(1) if auth_match else conn.req_host
+      print('Authentication failed. Please make sure your .gitcookies '
+            'file has credentials for %s.' % host)
+    print('Try:\n  git cl creds-check')
+
+  reason = '%s: %s' % (response.reason, contents)
+  raise GerritError(response.status, reason)
 
 
 def ReadHttpJsonResponse(conn, accept_statuses=frozenset([200])):
@@ -509,6 +510,7 @@ def QueryChanges(host, params, first_param=None, limit=None, o_params=None,
     start: how many changes to skip (starting with the most recent)
     o_params: A list of additional output specifiers, as documented here:
         https://gerrit-review.googlesource.com/Documentation/rest-api-changes.html#list-changes
+
   Returns:
     A list of json-decoded query results.
   """
@@ -527,11 +529,11 @@ def QueryChanges(host, params, first_param=None, limit=None, o_params=None,
 
 def GenerateAllChanges(host, params, first_param=None, limit=500,
                        o_params=None, start=None):
-  """
-  Queries a gerrit-on-borg server for all the changes matching the query terms.
+  """Queries a gerrit-on-borg server for all the changes matching the query
+  terms.
 
   WARNING: this is unreliable if a change matching the query is modified while
-    this function is being called.
+  this function is being called.
 
   A single query to gerrit-on-borg is limited on the number of results by the
   limit parameter on the request (see QueryChanges) and the server maximum
@@ -547,6 +549,7 @@ def GenerateAllChanges(host, params, first_param=None, limit=500,
     A generator object to the list of returned changes.
   """
   already_returned = set()
+
   def at_most_once(cls):
     for cl in cls:
       if cl['_number'] not in already_returned:
@@ -563,7 +566,7 @@ def GenerateAllChanges(host, params, first_param=None, limit=500,
     # (say user posting comment), subsequent calls may overalp like this:
     #   > initial order ABCDEFGH
     #   query[0..3]  => ABC
-    #   > E get's updated. New order: EABCDFGH
+    #   > E gets updated. New order: EABCDFGH
     #   query[3..6] => CDF   # C is a dup
     #   query[6..9] => GH    # E is missed.
     page = QueryChanges(host, params, first_param, limit, o_params,
@@ -594,7 +597,7 @@ def MultiQueryChanges(host, params, change_list, limit=None, o_params=None,
   if not change_list:
     raise RuntimeError(
         "MultiQueryChanges requires a list of change numbers/id's")
-  q = ['q=%s' % '+OR+'.join([urllib.quote(str(x)) for x in change_list])]
+  q = ['q=%s' % '+OR+'.join([urllib.parse.quote(str(x)) for x in change_list])]
   if params:
     q.append(_QueryString(params))
   if limit:
@@ -613,14 +616,15 @@ def MultiQueryChanges(host, params, change_list, limit=None, o_params=None,
 
 
 def GetGerritFetchUrl(host):
-  """Given a gerrit host name returns URL of a gerrit instance to fetch from."""
+  """Given a Gerrit host name returns URL of a Gerrit instance to fetch from."""
   return '%s://%s/' % (GERRIT_PROTOCOL, host)
 
 
 def GetCodeReviewTbrScore(host, project):
-  """Given a gerrit host name and project, return the Code-Review score for TBR.
+  """Given a Gerrit host name and project, return the Code-Review score for TBR.
   """
-  conn = CreateHttpConn(host, '/projects/%s' % urllib.quote(project, safe=''))
+  conn = CreateHttpConn(
+      host, '/projects/%s' % urllib.parse.quote(project, ''))
   project = ReadHttpJsonResponse(conn)
   if ('labels' not in project
       or 'Code-Review' not in project['labels']
@@ -630,23 +634,23 @@ def GetCodeReviewTbrScore(host, project):
 
 
 def GetChangePageUrl(host, change_number):
-  """Given a gerrit host name and change number, return change page url."""
+  """Given a Gerrit host name and change number, returns change page URL."""
   return '%s://%s/#/c/%d/' % (GERRIT_PROTOCOL, host, change_number)
 
 
 def GetChangeUrl(host, change):
-  """Given a gerrit host name and change id, return an url for the change."""
+  """Given a Gerrit host name and change ID, returns a URL for the change."""
   return '%s://%s/a/changes/%s' % (GERRIT_PROTOCOL, host, change)
 
 
 def GetChange(host, change):
-  """Query a gerrit server for information about a single change."""
+  """Queries a Gerrit server for information about a single change."""
   path = 'changes/%s' % change
   return ReadHttpJsonResponse(CreateHttpConn(host, path))
 
 
 def GetChangeDetail(host, change, o_params=None):
-  """Query a gerrit server for extended information about a single change."""
+  """Queries a Gerrit server for extended information about a single change."""
   path = 'changes/%s/detail' % change
   if o_params:
     path += '?%s' % '&'.join(['o=%s' % p for p in o_params])
@@ -654,7 +658,7 @@ def GetChangeDetail(host, change, o_params=None):
 
 
 def GetChangeCommit(host, change, revision='current'):
-  """Query a gerrit server for a revision associated with a change."""
+  """Query a Gerrit server for a revision associated with a change."""
   path = 'changes/%s/revisions/%s/commit?links' % (change, revision)
   return ReadHttpJsonResponse(CreateHttpConn(host, path))
 
@@ -665,12 +669,12 @@ def GetChangeCurrentRevision(host, change):
 
 
 def GetChangeRevisions(host, change):
-  """Get information about all revisions associated with a change."""
+  """Gets information about all revisions associated with a change."""
   return QueryChanges(host, [], change, o_params=('ALL_REVISIONS',))
 
 
 def GetChangeReview(host, change, revision=None):
-  """Get the current review information for a change."""
+  """Gets the current review information for a change."""
   if not revision:
     jmsg = GetChangeRevisions(host, change)
     if not jmsg:
@@ -689,13 +693,13 @@ def GetChangeComments(host, change):
 
 
 def GetChangeRobotComments(host, change):
-  """Get the line- and file-level robot comments on a change."""
+  """Gets the line- and file-level robot comments on a change."""
   path = 'changes/%s/robotcomments' % change
   return ReadHttpJsonResponse(CreateHttpConn(host, path))
 
 
 def AbandonChange(host, change, msg=''):
-  """Abandon a gerrit change."""
+  """Abandons a Gerrit change."""
   path = 'changes/%s/abandon' % change
   body = {'message': msg} if msg else {}
   conn = CreateHttpConn(host, path, reqtype='POST', body=body)
@@ -703,7 +707,7 @@ def AbandonChange(host, change, msg=''):
 
 
 def RestoreChange(host, change, msg=''):
-  """Restore a previously abandoned change."""
+  """Restores a previously abandoned change."""
   path = 'changes/%s/restore' % change
   body = {'message': msg} if msg else {}
   conn = CreateHttpConn(host, path, reqtype='POST', body=body)
@@ -711,7 +715,7 @@ def RestoreChange(host, change, msg=''):
 
 
 def SubmitChange(host, change, wait_for_merge=True):
-  """Submits a gerrit change via Gerrit."""
+  """Submits a Gerrit change via Gerrit."""
   path = 'changes/%s/submit' % change
   body = {'wait_for_merge': wait_for_merge}
   conn = CreateHttpConn(host, path, reqtype='POST', body=body)
@@ -732,7 +736,7 @@ def HasPendingChangeEdit(host, change):
 
 def DeletePendingChangeEdit(host, change):
   conn = CreateHttpConn(host, 'changes/%s/edit' % change, reqtype='DELETE')
-  # On success, gerrit returns status 204; if the edit was already deleted it
+  # On success, Gerrit returns status 204; if the edit was already deleted it
   # returns 404.  Anything else is an error.
   ReadHttpResponse(conn, accept_statuses=[204, 404])
 
@@ -753,13 +757,13 @@ def SetCommitMessage(host, change, description, notify='ALL'):
 
 
 def GetReviewers(host, change):
-  """Get information about all reviewers attached to a change."""
+  """Gets information about all reviewers attached to a change."""
   path = 'changes/%s/reviewers' % change
   return ReadHttpJsonResponse(CreateHttpConn(host, path))
 
 
 def GetReview(host, change, revision):
-  """Get review information about a specific revision of a change."""
+  """Gets review information about a specific revision of a change."""
   path = 'changes/%s/revisions/%s/review' % (change, revision)
   return ReadHttpJsonResponse(CreateHttpConn(host, path))
 
@@ -786,7 +790,7 @@ def AddReviewers(host, change, reviewers=None, ccs=None, notify=True,
      'reviewer': r,
      'state': state,
      'notify': 'NONE',  # We handled `notify` argument above.
-   })
+    })
 
   conn = CreateHttpConn(host, path, reqtype='POST', body=body)
   # Gerrit will return 400 if one or more of the requested reviewers are
@@ -795,7 +799,7 @@ def AddReviewers(host, change, reviewers=None, ccs=None, notify=True,
   resp = ReadHttpJsonResponse(conn, accept_statuses=accept_statuses)
 
   errored = set()
-  for result in resp.get('reviewers', {}).itervalues():
+  for result in resp.get('reviewers', {}).values():
     r = result.get('input')
     state = 'REVIEWER' if r in reviewers else 'CC'
     if result.get('error'):
@@ -807,26 +811,8 @@ def AddReviewers(host, change, reviewers=None, ccs=None, notify=True,
                  ccs=(ccs-errored), notify=notify, accept_statuses=[200])
 
 
-def RemoveReviewers(host, change, remove=None):
-  """Remove reveiewers from a change."""
-  if not remove:
-    return
-  if isinstance(remove, basestring):
-    remove = (remove,)
-  for r in remove:
-    path = 'changes/%s/reviewers/%s' % (change, r)
-    conn = CreateHttpConn(host, path, reqtype='DELETE')
-    try:
-      ReadHttpResponse(conn, accept_statuses=[204])
-    except GerritError as e:
-      raise GerritError(
-          e.http_status,
-          'Received unexpected http status while deleting reviewer "%s" '
-          'from change %s' % (r, change))
-
-
 def SetReview(host, change, msg=None, labels=None, notify=None, ready=None):
-  """Set labels and/or add a message to a code review."""
+  """Sets labels and/or adds a message to a code review."""
   if not msg and not labels:
     return
   path = 'changes/%s/revisions/current/review' % change
@@ -842,7 +828,7 @@ def SetReview(host, change, msg=None, labels=None, notify=None, ready=None):
   conn = CreateHttpConn(host, path, reqtype='POST', body=body)
   response = ReadHttpJsonResponse(conn)
   if labels:
-    for key, val in labels.iteritems():
+    for key, val in labels.items():
       if ('labels' not in response or key not in response['labels'] or
           int(response['labels'][key] != int(val))):
         raise GerritError(200, 'Unable to set "%s" label on change %s.' % (
@@ -851,7 +837,7 @@ def SetReview(host, change, msg=None, labels=None, notify=None, ready=None):
 
 def ResetReviewLabels(host, change, label, value='0', message=None,
                       notify=None):
-  """Reset the value of a given label for all reviewers on a change."""
+  """Resets the value of a given label for all reviewers on a change."""
   # This is tricky, because we want to work on the "current revision", but
   # there's always the risk that "current revision" will change in between
   # API calls.  So, we check "current revision" at the beginning and end; if
@@ -867,7 +853,7 @@ def ResetReviewLabels(host, change, label, value='0', message=None,
       '%s label set to %s programmatically.' % (label, value))
   jmsg = GetReview(host, change, revision)
   if not jmsg:
-    raise GerritError(200, 'Could not get review information for revison %s '
+    raise GerritError(200, 'Could not get review information for revision %s '
                    'of change %s' % (revision, change))
   for review in jmsg.get('labels', {}).get(label, {}).get('all', []):
     if str(review.get('value', value)) != value:
@@ -896,12 +882,12 @@ def ResetReviewLabels(host, change, label, value='0', message=None,
 
 
 def CreateGerritBranch(host, project, branch, commit):
-  """
-  Create a new branch from given project and commit
+  """Creates a new branch from given project and commit
+
   https://gerrit-review.googlesource.com/Documentation/rest-api-projects.html#create-branch
 
   Returns:
-    A JSON with 'ref' key
+    A JSON object with 'ref' key.
   """
   path = 'projects/%s/branches/%s' % (project, branch)
   body = {'revision': commit}
@@ -913,12 +899,13 @@ def CreateGerritBranch(host, project, branch, commit):
 
 
 def GetGerritBranch(host, project, branch):
-  """
-  Get a branch from given project and commit
+  """Gets a branch from given project and commit.
+
+  See:
   https://gerrit-review.googlesource.com/Documentation/rest-api-projects.html#get-branch
 
   Returns:
-    A JSON object with 'revision' key
+    A JSON object with 'revision' key.
   """
   path = 'projects/%s/branches/%s' % (project, branch)
   conn = CreateHttpConn(host, path, reqtype='GET')
@@ -935,7 +922,7 @@ def GetAccountDetails(host, account_id='self'):
   whichever account user is authenticating as.
 
   Documentation:
-    https://gerrit-review.googlesource.com/Documentation/rest-api-accounts.html#get-account
+  https://gerrit-review.googlesource.com/Documentation/rest-api-accounts.html#get-account
 
   Returns None if account is not found (i.e., Gerrit returned 404).
   """
@@ -949,15 +936,17 @@ def ValidAccounts(host, accounts, max_threads=10):
   Invalid accounts, either not existing or without unique match,
   are not present as returned dictionary keys.
   """
-  assert not isinstance(accounts, basestring), type(accounts)
+  assert not isinstance(accounts, str), type(accounts)
   accounts = list(set(accounts))
   if not accounts:
     return {}
+
   def get_one(account):
     try:
       return account, GetAccountDetails(host, account)
     except GerritError:
       return None, None
+
   valid = {}
   with contextlib.closing(ThreadPool(min(max_threads, len(accounts)))) as pool:
     for account, details in pool.map(get_one, accounts):
@@ -967,12 +956,11 @@ def ValidAccounts(host, accounts, max_threads=10):
 
 
 def PercentEncodeForGitRef(original):
-  """Apply percent-encoding for strings sent to gerrit via git ref metadata.
+  """Applies percent-encoding for strings sent to Gerrit via git ref metadata.
 
-  The encoding used is based on but stricter than URL encoding (Section 2.1
-  of RFC 3986). The only non-escaped characters are alphanumerics, and
-  'SPACE' (U+0020) can be represented as 'LOW LINE' (U+005F) or
-  'PLUS SIGN' (U+002B).
+  The encoding used is based on but stricter than URL encoding (Section 2.1 of
+  RFC 3986). The only non-escaped characters are alphanumerics, and 'SPACE'
+  (U+0020) can be represented as 'LOW LINE' (U+005F) or 'PLUS SIGN' (U+002B).
 
   For more information, see the Gerrit docs here:
 
@@ -981,7 +969,7 @@ def PercentEncodeForGitRef(original):
   safe = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 '
   encoded = ''.join(c if c in safe else '%%%02X' % ord(c) for c in original)
 
-  # spaces are not allowed in git refs; gerrit will interpret either '_' or
+  # Spaces are not allowed in git refs; gerrit will interpret either '_' or
   # '+' (or '%20') as space. Use '_' since that has been supported the longest.
   return encoded.replace(' ', '_')
 
@@ -1005,32 +993,4 @@ def ChangeIdentifier(project, change_number):
   comparing to specifying just change_number.
   """
   assert int(change_number)
-  return '%s~%s' % (urllib.quote(project, safe=''), change_number)
-
-
-# TODO(crbug/881860): remove this hack.
-_GERRIT_MIRROR_PREFIXES = ['us1', 'us2', 'us3', 'eu1']
-assert all(3 == len(p) for p in _GERRIT_MIRROR_PREFIXES)
-
-
-def _UseGerritMirror(url, host):
-  """Returns new url which uses randomly selected mirror for a gerrit host.
-
-  url's host should be for a given host or a result of prior call to this
-  function.
-
-  Assumes url has a single occurence of the host substring.
-  """
-  assert host in url
-  suffix = '-mirror-' + host
-  prefixes = set(_GERRIT_MIRROR_PREFIXES)
-  prefix_len = len(_GERRIT_MIRROR_PREFIXES[0])
-  st = url.find(suffix)
-  if st == -1:
-    actual_host = host
-  else:
-    # Already uses some mirror.
-    assert st >= prefix_len, (uri, host, st, prefix_len)
-    prefixes.remove(url[st-prefix_len:st])
-    actual_host = url[st-prefix_len:st+len(suffix)]
-  return url.replace(actual_host, random.choice(list(prefixes)) + suffix)
+  return '%s~%s' % (urllib.parse.quote(project, ''), change_number)