libv8 7.3.492.27.1 → 8.4.255.0

data/vendor/depot_tools/man/src/common_demo_functions.sh

@@ -37,7 +37,7 @@ praw() {
 pcommand() {
   praw "$(python -c '\
     import sys, pipes; \
-    print " ".join(map(pipes.quote, sys.argv[1:]))' "$@")"
+    print(" ".join(map(pipes.quote, sys.argv[1:])))' "$@")"
 }
 
 # run a visible command
@@ -71,7 +71,7 @@ add() {
   if [[ ! $CONTENT ]]
   then
     CONTENT=$(python -c 'import random, string; \
-      print "".join(random.sample(string.lowercase, 16))')
+      print("".join(random.sample(string.lowercase, 16)))')
   fi
   echo "$CONTENT" > $1
   silent git add $1

data/vendor/depot_tools/man/src/depot_tools_tutorial.txt

@@ -74,13 +74,13 @@ Clone the 'depot_tools' repository:
 [white]**$ git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git**
 ----
 
-Add 'depot_tools' to the 'end' of your PATH (you will probably want to put this
+Add 'depot_tools' to the 'front' of your PATH (you will probably want to put this
 in your `~/.bashrc` or `~/.zshrc`). Assuming you cloned 'depot_tools' to
 `/path/to/depot_tools`:
 
 [postsubs="quotes"]
 ----
-[white]**$ export PATH=$PATH:/path/to/depot_tools**
+[white]**$ export PATH=/path/to/depot_tools:$PATH**
 ----
 
 // No need to show the Windows stuff on the manpage output.
@@ -96,7 +96,7 @@ extract it somewhere.
 extract the hidden ``.git'' folder which is necessary for 'depot_tools' to
 autoupdate itself. You can use ``Extract all...'' from the context menu though.
 
-Add 'depot_tools' to the 'start' of your PATH (must be ahead of any installs of
+Add 'depot_tools' to the 'front' of your PATH (must be ahead of any installs of
 Python). Assuming you unzipped the bundle to `C:\workspace\depot_tools`:
 
 With Administrator access: ::

data/vendor/depot_tools/man/src/filter_demo_output.py

@@ -3,6 +3,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+from __future__ import print_function
+
 import collections
 import os
 import re
@@ -13,7 +15,7 @@ from xml.sax.saxutils import escape
 from cStringIO import StringIO
 
 if not os.path.exists('ansi2html'):
-  print 'You must run ./make_docs.sh once before running this script.'
+  print('You must run ./make_docs.sh once before running this script.')
   sys.exit(1)
 
 # This dependency is pulled in by make_docs.sh
@@ -66,7 +68,7 @@ def main():
   backend = sys.argv[1]
   output = sys.stdin.read().rstrip()
 
-  callout_re = re.compile('\x1b\[(\d+)c\n')
+  callout_re = re.compile(r'\x1b\[(\d+)c\n')
   callouts = collections.defaultdict(int)
   for i, line in enumerate(output.splitlines(True)):
     m = callout_re.match(line)

data/vendor/depot_tools/man/src/git-new-branch.txt

@@ -52,7 +52,8 @@ depot-tools.upstream
 ~~~~~~~~~~~~~~~~~~~~
 
 This configures the default 'upstream' for all new branches. If it is unset, it
-defaults to 'origin/master'.  This is considered to be the 'root' branch.
+defaults to 'origin''s default branch or 'origin/master' if that can't be found.
+This is considered to be the 'root' branch.
 
 EXAMPLE
 -------

data/vendor/depot_tools/man/src/git-rebase-update.txt

@@ -63,13 +63,17 @@ Restoration::
   `git rebase-update` checks out the branch that you started on, and 'thaws' it,
   if necessary (see linkgit:git-thaw[1]). If the branch you started on got
   cleaned up, `git rebase-update` will checkout the 'root' ref (defaults to
-  'origin/master', as configured by `depot-tools.upstream`, see
+  'origin''s default branch, as configured by `depot-tools.upstream`, see
   linkgit:git-new-branch[1]).
 
 
 OPTIONS
 -------
 
+-k::
+--keep-going::
+  Keep processing past failed rebases.
+
 -n::
 --no-fetch::
   Skip the `git fetch` phase of rebase-update.
@@ -78,6 +82,9 @@ OPTIONS
 --verbose::
   More text than your terminal can handle.
 
+--current::
+  Only rebase the current branch.
+
 
 CONFIGURATION VARIABLES
 -----------------------

data/vendor/depot_tools/metrics.README.md

@@ -30,12 +30,12 @@ First, some words about what data we are **NOT** collecting:
 - We won't record information about the current directory or environment flags.
 - We won't record arbitrary strings. We only collect a string if it is in the
   list available at
-  https://chromium.googlesource.com/infra/infra/+/master/go/src/infra/appengine/depot_tools_metrics/metrics/metrics_schema.json#45
+  https://source.chromium.org/chromium/infra/infra/+/master:go/src/infra/appengine/depot_tools_metrics/metrics/constants.go
 
 The metrics we're collecting are:
 
-- A timestamp, with a week resolution.
-- The age of your depot\_tools checkout, with a week resolution.
+- The time when the command was run.
+- The age of your depot\_tools checkout.
 - Your version of Python (in the format major.minor.micro).
 - Your version of Git (in the format major.minor.micro).
 - The OS of your machine (i.e. win, linux or mac).
@@ -47,7 +47,7 @@ The metrics we're collecting are:
 - The exit code.
 - The project you're working on. We only record data about projects you can
   fetch using depot\_tools' fetch command (e.g. Chromium, WebRTC, V8, etc)
-- The age of your project checkout, with a week resolution.
+- The age of your project checkout.
 - What features are you using in your DEPS and .gclient files. For example:
   - Are you setting `use_relative_paths=True`?
   - Are you using `recursedeps`?
@@ -72,7 +72,10 @@ The metrics we're collecting are:
   - What was the exit code?
 
 The list of all known strings we collect can be found at
-https://chromium.googlesource.com/infra/infra/+/master/go/src/infra/appengine/depot_tools_metrics/metrics/metrics_schema.json#45
+https://source.chromium.org/chromium/infra/infra/+/master:go/src/infra/appengine/depot_tools_metrics/metrics/constants.go
+
+The schema for the metrics being collected can be found at
+https://source.chromium.org/chromium/infra/infra/+/master:go/src/infra/appengine/depot_tools_metrics/schema/schema.proto
 
 ## Why am I seeing this message *again*?
 

data/vendor/depot_tools/metrics.py

@@ -9,7 +9,6 @@ import contextlib
 import functools
 import json
 import os
-import subprocess
 import sys
 import tempfile
 import threading
@@ -24,6 +23,7 @@ except ImportError:  # For Py3 compatibility
 import detect_host_arch
 import gclient_utils
 import metrics_utils
+import subprocess2
 
 
 DEPOT_TOOLS = os.path.dirname(os.path.abspath(__file__))
@@ -184,13 +184,13 @@ class MetricsCollector(object):
     # We invoke a subprocess, and use stdin.write instead of communicate(),
     # so that we are able to return immediately, leaving the upload running in
     # the background.
-    p = subprocess.Popen([sys.executable, UPLOAD_SCRIPT], stdin=subprocess.PIPE)
-    p.stdin.write(json.dumps(self._reported_metrics))
+    p = subprocess2.Popen(['vpython3', UPLOAD_SCRIPT], stdin=subprocess2.PIPE)
+    p.stdin.write(json.dumps(self._reported_metrics).encode('utf-8'))
 
   def _collect_metrics(self, func, command_name, *args, **kwargs):
     # If we're already collecting metrics, just execute the function.
     # e.g. git-cl split invokes git-cl upload several times to upload each
-    # splitted CL.
+    # split CL.
     if self.collecting_metrics:
       # Don't collect metrics for this function.
       # e.g. Don't record the arguments git-cl split passes to git-cl upload.
@@ -198,6 +198,7 @@ class MetricsCollector(object):
         return func(*args, **kwargs)
 
     self._collecting_metrics = True
+    self.add('metrics_version', metrics_utils.CURRENT_VERSION)
     self.add('command', command_name)
     try:
       start = time.time()
@@ -213,14 +214,14 @@ class MetricsCollector(object):
     self.add('exit_code', exit_code)
 
     # Add metrics regarding environment information.
-    self.add('timestamp', metrics_utils.seconds_to_weeks(time.time()))
+    self.add('timestamp', int(time.time()))
     self.add('python_version', metrics_utils.get_python_version())
     self.add('host_os', gclient_utils.GetMacWinOrLinux())
     self.add('host_arch', detect_host_arch.HostArch())
 
     depot_tools_age = metrics_utils.get_repo_timestamp(DEPOT_TOOLS)
     if depot_tools_age is not None:
-      self.add('depot_tools_age', depot_tools_age)
+      self.add('depot_tools_age', int(depot_tools_age))
 
     git_version = metrics_utils.get_git_version()
     if git_version:

data/vendor/depot_tools/metrics_utils.py

@@ -168,7 +168,7 @@ def get_git_version():
       ['git', '--version'],
       stdout=subprocess2.PIPE, stderr=subprocess2.PIPE)
   stdout, _ = p.communicate()
-  match = GIT_VERSION_RE.match(stdout)
+  match = GIT_VERSION_RE.match(stdout.decode('utf-8'))
   if not match:
     return None
   return '%s.%s.%s' % match.groups()
@@ -183,15 +183,6 @@ def return_code_from_exception(exception):
   return 1
 
 
-def seconds_to_weeks(duration):
-  """Transform a |duration| from seconds to weeks approximately.
-
-  Drops the lowest 19 bits of the integer representation, which ammounts to
-  about 6 days.
-  """
-  return int(duration) >> 19
-
-
 def extract_known_subcommand_args(args):
   """Extract the known arguments from the passed list of args."""
   known_args = []
@@ -235,7 +226,7 @@ def extract_http_metrics(request_uri, method, status, response_time):
   if parsed_url.netloc in KNOWN_HTTP_HOSTS:
     http_metrics['host'] = parsed_url.netloc
 
-  for name, path_re in KNOWN_HTTP_PATHS.iteritems():
+  for name, path_re in KNOWN_HTTP_PATHS.items():
     if path_re.match(parsed_url.path):
       http_metrics['path'] = name
       break
@@ -276,8 +267,7 @@ def get_repo_timestamp(path_to_repo):
   if p.returncode != 0:
     return None
 
-  # Get the age of the checkout in weeks.
-  return seconds_to_weeks(stdout.strip())
+  return stdout.strip()
 
 def print_boxed_text(out, min_width, lines):
   [EW, NS, SE, SW, NE, NW] = list('=|++++')
@@ -297,7 +287,7 @@ def print_notice(countdown):
 def print_version_change(config_version):
   """Print a notice to let the user know we are collecting more metrics."""
   lines = list(get_notice_version_change_header())
-  for version in xrange(config_version + 1, CURRENT_VERSION + 1):
+  for version in range(config_version + 1, CURRENT_VERSION + 1):
     lines.append('')
     lines += list(get_change_notice(version))
   print_boxed_text(sys.stderr.write, 49, lines)

data/vendor/depot_tools/my_activity.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env vpython
+#!/usr/bin/env vpython3
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
@@ -9,8 +9,8 @@ Example:
   - my_activity.py  for stats for the current week (last week on mondays).
   - my_activity.py -Q  for stats for last quarter.
   - my_activity.py -Y  for stats for this year.
-  - my_activity.py -b 4/5/12  for stats since 4/5/12.
-  - my_activity.py -b 4/5/12 -e 6/7/12 for stats between 4/5/12 and 6/7/12.
+  - my_activity.py -b 4/24/19  for stats since April 24th 2019.
+  - my_activity.py -b 4/24/19 -e 6/16/19 stats between April 24th and June 16th.
   - my_activity.py -jd to output stats for the week to json with deltas data.
 """
 
@@ -21,22 +21,13 @@ Example:
 # check those details to determine if there was activity in the given period.
 # This means that query time scales mostly with (today() - begin).
 
-# [VPYTHON:BEGIN]
-# wheel: <
-#   name: "infra/python/wheels/python-dateutil-py2_py3"
-#   version: "version:2.7.3"
-# >
-# wheel: <
-#   name: "infra/python/wheels/six-py2_py3"
-#   version: "version:1.10.0"
-# >
-# [VPYTHON:END]
+from __future__ import print_function
 
 import collections
 import contextlib
 from datetime import datetime
 from datetime import timedelta
-from functools import partial
+import httplib2
 import itertools
 import json
 import logging
@@ -51,10 +42,16 @@ import re
 
 import auth
 import fix_encoding
+import gclient_utils
 import gerrit_util
-import rietveld
 
-from third_party import httplib2
+
+if sys.version_info.major == 2:
+  logging.warning(
+      'Python 2 is deprecated. Run my_activity.py using vpython3.')
+  import urllib as urllib_parse
+else:
+  import urllib.parse as urllib_parse
 
 try:
   import dateutil  # pylint: disable=import-error
@@ -71,43 +68,18 @@ class DefaultFormatter(Formatter):
     self.default = default
 
   def get_value(self, key, args, kwds):
-    if isinstance(key, basestring) and key not in kwds:
+    if isinstance(key, str) and key not in kwds:
       return self.default
     return Formatter.get_value(self, key, args, kwds)
 
-rietveld_instances = [
+gerrit_instances = [
   {
-    'url': 'codereview.chromium.org',
-    'shorturl': 'crrev.com',
-    'supports_owner_modified_query': True,
-    'requires_auth': False,
-    'email_domain': 'chromium.org',
+    'url': 'android-review.googlesource.com',
+    'shorturl': 'r.android.com',
     'short_url_protocol': 'https',
   },
   {
-    'url': 'chromereviews.googleplex.com',
-    'shorturl': 'go/chromerev',
-    'supports_owner_modified_query': True,
-    'requires_auth': True,
-    'email_domain': 'google.com',
-  },
-  {
-    'url': 'codereview.appspot.com',
-    'supports_owner_modified_query': True,
-    'requires_auth': False,
-    'email_domain': 'chromium.org',
-  },
-  {
-    'url': 'breakpad.appspot.com',
-    'supports_owner_modified_query': False,
-    'requires_auth': False,
-    'email_domain': 'chromium.org',
-  },
-]
-
-gerrit_instances = [
-  {
-    'url': 'android-review.googlesource.com',
+    'url': 'gerrit-review.googlesource.com',
   },
   {
     'url': 'chrome-internal-review.googlesource.com',
@@ -119,6 +91,9 @@ gerrit_instances = [
     'shorturl': 'crrev.com/c',
     'short_url_protocol': 'https',
   },
+  {
+    'url': 'dawn-review.googlesource.com',
+  },
   {
     'url': 'pdfium-review.googlesource.com',
   },
@@ -128,17 +103,22 @@ gerrit_instances = [
 ]
 
 monorail_projects = {
+  'angleproject': {
+    'shorturl': 'anglebug.com',
+    'short_url_protocol': 'http',
+  },
   'chromium': {
     'shorturl': 'crbug.com',
     'short_url_protocol': 'https',
   },
+  'dawn': {},
   'google-breakpad': {},
   'gyp': {},
-  'skia': {},
   'pdfium': {
     'shorturl': 'crbug.com/pdfium',
     'short_url_protocol': 'https',
   },
+  'skia': {},
   'v8': {
     'shorturl': 'crbug.com/v8',
     'short_url_protocol': 'https',
@@ -157,7 +137,7 @@ def datetime_to_midnight(date):
 
 def get_quarter_of(date):
   begin = (datetime_to_midnight(date) -
-           relativedelta(months=(date.month % 3) - 1, days=(date.day - 1)))
+           relativedelta(months=(date.month - 1) % 3, days=(date.day - 1)))
   return begin, begin + relativedelta(months=3)
 
 
@@ -174,7 +154,7 @@ def get_week_of(date):
 
 def get_yes_or_no(msg):
   while True:
-    response = raw_input(msg + ' yes/no [no] ')
+    response = gclient_utils.AskForData(msg + ' yes/no [no] ')
     if response == 'y' or response == 'yes':
       return True
     elif not response or response == 'n' or response == 'no':
@@ -185,18 +165,27 @@ def datetime_from_gerrit(date_string):
   return datetime.strptime(date_string, '%Y-%m-%d %H:%M:%S.%f000')
 
 
-def datetime_from_rietveld(date_string):
-  try:
-    return datetime.strptime(date_string, '%Y-%m-%d %H:%M:%S.%f')
-  except ValueError:
-    # Sometimes rietveld returns a value without the milliseconds part, so we
-    # attempt to parse those cases as well.
-    return datetime.strptime(date_string, '%Y-%m-%d %H:%M:%S')
-
-
 def datetime_from_monorail(date_string):
   return datetime.strptime(date_string, '%Y-%m-%dT%H:%M:%S')
 
+def extract_bug_numbers_from_description(issue):
+  # Getting the description for REST Gerrit
+  revision = issue['revisions'][issue['current_revision']]
+  description = revision['commit']['message']
+
+  bugs = []
+  # Handle both "Bug: 99999" and "BUG=99999" bug notations
+  # Multiple bugs can be noted on a single line or in multiple ones.
+  matches = re.findall(
+      r'^(BUG=|(Bug|Fixed):\s*)((((?:[a-zA-Z0-9-]+:)?\d+)(,\s?)?)+)',
+      description, flags=re.IGNORECASE | re.MULTILINE)
+  if matches:
+    for match in matches:
+      bugs.extend(match[2].replace(' ', '').split(','))
+    # Add default chromium: prefix if none specified.
+    bugs = [bug if ':' in bug else 'chromium:%s' % bug for bug in bugs]
+
+  return sorted(set(bugs))
 
 class MyActivity(object):
   def __init__(self, options):
@@ -208,164 +197,15 @@ class MyActivity(object):
     self.reviews = []
     self.issues = []
     self.referenced_issues = []
-    self.check_cookies()
     self.google_code_auth_token = None
     self.access_errors = set()
+    self.skip_servers = (options.skip_servers.split(','))
 
   def show_progress(self, how='.'):
     if sys.stdout.isatty():
       sys.stdout.write(how)
       sys.stdout.flush()
 
-  # Check the codereview cookie jar to determine which Rietveld instances to
-  # authenticate to.
-  def check_cookies(self):
-    filtered_instances = []
-
-    def has_cookie(instance):
-      auth_config = auth.extract_auth_config_from_options(self.options)
-      a = auth.get_authenticator_for_host(instance['url'], auth_config)
-      return a.has_cached_credentials()
-
-    for instance in rietveld_instances:
-      instance['auth'] = has_cookie(instance)
-
-    if filtered_instances:
-      logging.warning('No cookie found for the following Rietveld instance%s:',
-                   's' if len(filtered_instances) > 1 else '')
-      for instance in filtered_instances:
-        logging.warning('\t' + instance['url'])
-      logging.warning('Use --auth if you would like to authenticate to them.')
-
-  def rietveld_search(self, instance, owner=None, reviewer=None):
-    if instance['requires_auth'] and not instance['auth']:
-      return []
-
-
-    email = None if instance['auth'] else ''
-    auth_config = auth.extract_auth_config_from_options(self.options)
-    remote = rietveld.Rietveld('https://' + instance['url'], auth_config, email)
-
-    # See def search() in rietveld.py to see all the filters you can use.
-    query_modified_after = None
-
-    if instance['supports_owner_modified_query']:
-      query_modified_after = self.modified_after.strftime('%Y-%m-%d')
-
-    # Rietveld does not allow search by both created_before and modified_after.
-    # (And some instances don't allow search by both owner and modified_after)
-    owner_email = None
-    reviewer_email = None
-    if owner:
-      owner_email = owner + '@' + instance['email_domain']
-    if reviewer:
-      reviewer_email = reviewer + '@' + instance['email_domain']
-    issues = remote.search(
-        owner=owner_email,
-        reviewer=reviewer_email,
-        modified_after=query_modified_after,
-        with_messages=True)
-    self.show_progress()
-
-    issues = filter(
-        lambda i: (datetime_from_rietveld(i['created']) < self.modified_before),
-        issues)
-    issues = filter(
-        lambda i: (datetime_from_rietveld(i['modified']) > self.modified_after),
-        issues)
-
-    should_filter_by_user = True
-    issues = map(partial(self.process_rietveld_issue, remote, instance), issues)
-    issues = filter(
-        partial(self.filter_issue, should_filter_by_user=should_filter_by_user),
-        issues)
-    issues = sorted(issues, key=lambda i: i['modified'], reverse=True)
-
-    return issues
-
-  def extract_bug_numbers_from_description(self, issue):
-    description = None
-
-    if 'description' in issue:
-      # Getting the  description for Rietveld
-      description = issue['description']
-    elif 'revisions' in issue:
-      # Getting the description for REST Gerrit
-      revision = issue['revisions'][issue['current_revision']]
-      description = revision['commit']['message']
-
-    bugs = []
-    if description:
-      # Handle both "Bug: 99999" and "BUG=99999" bug notations
-      # Multiple bugs can be noted on a single line or in multiple ones.
-      matches = re.findall(
-          r'BUG[=:]\s?((((?:[a-zA-Z0-9-]+:)?\d+)(,\s?)?)+)', description,
-          flags=re.IGNORECASE)
-      if matches:
-        for match in matches:
-          bugs.extend(match[0].replace(' ', '').split(','))
-        # Add default chromium: prefix if none specified.
-        bugs = [bug if ':' in bug else 'chromium:%s' % bug for bug in bugs]
-
-    return sorted(set(bugs))
-
-  def process_rietveld_issue(self, remote, instance, issue):
-    ret = {}
-    if self.options.deltas:
-      patchset_props = remote.get_patchset_properties(
-          issue['issue'],
-          issue['patchsets'][-1])
-      self.show_progress()
-      ret['delta'] = '+%d,-%d' % (
-          sum(f['num_added'] for f in patchset_props['files'].itervalues()),
-          sum(f['num_removed'] for f in patchset_props['files'].itervalues()))
-
-    if issue['landed_days_ago'] != 'unknown':
-      ret['status'] = 'committed'
-    elif issue['closed']:
-      ret['status'] = 'closed'
-    elif len(issue['reviewers']) and issue['all_required_reviewers_approved']:
-      ret['status'] = 'ready'
-    else:
-      ret['status'] = 'open'
-
-    ret['owner'] = issue['owner_email']
-    ret['author'] = ret['owner']
-
-    ret['reviewers'] = set(issue['reviewers'])
-
-    if 'shorturl' in instance:
-      url = instance['shorturl']
-      protocol = instance.get('short_url_protocol', 'http')
-    else:
-      url = instance['url']
-      protocol = 'https'
-
-    ret['review_url'] = '%s://%s/%d' % (protocol, url, issue['issue'])
-
-    # Rietveld sometimes has '\r\n' instead of '\n'.
-    ret['header'] = issue['description'].replace('\r', '').split('\n')[0]
-
-    ret['modified'] = datetime_from_rietveld(issue['modified'])
-    ret['created'] = datetime_from_rietveld(issue['created'])
-    ret['replies'] = self.process_rietveld_replies(issue['messages'])
-
-    ret['bugs'] = self.extract_bug_numbers_from_description(issue)
-    ret['landed_days_ago'] = issue['landed_days_ago']
-
-    return ret
-
-  @staticmethod
-  def process_rietveld_replies(replies):
-    ret = []
-    for reply in replies:
-      r = {}
-      r['author'] = reply['sender']
-      r['created'] = datetime_from_rietveld(reply['date'])
-      r['content'] = ''
-      ret.append(r)
-    return ret
-
   def gerrit_changes_over_rest(self, instance, filters):
     # Convert the "key:value" filter to a list of (key, value) pairs.
     req = list(f.split(':', 1) for f in filters)
@@ -375,13 +215,15 @@ class MyActivity(object):
       return list(gerrit_util.GenerateAllChanges(instance['url'], req,
           o_params=['MESSAGES', 'LABELS', 'DETAILED_ACCOUNTS',
                     'CURRENT_REVISION', 'CURRENT_COMMIT']))
-    except gerrit_util.GerritError, e:
+    except gerrit_util.GerritError as e:
       error_message = 'Looking up %r: %s' % (instance['url'], e)
       if error_message not in self.access_errors:
         self.access_errors.add(error_message)
       return []
 
   def gerrit_search(self, instance, owner=None, reviewer=None):
+    if instance['url'] in self.skip_servers:
+      return []
     max_age = datetime.today() - self.modified_after
     filters = ['-age:%ss' % (max_age.days * 24 * 3600 + max_age.seconds)]
     if owner:
@@ -430,7 +272,7 @@ class MyActivity(object):
       ret['replies'] = []
     ret['reviewers'] = set(r['author'] for r in ret['replies'])
     ret['reviewers'].discard(ret['author'])
-    ret['bugs'] = self.extract_bug_numbers_from_description(issue)
+    ret['bugs'] = extract_bug_numbers_from_description(issue)
     return ret
 
   @staticmethod
@@ -447,13 +289,10 @@ class MyActivity(object):
     return ret
 
   def monorail_get_auth_http(self):
-    auth_config = auth.extract_auth_config_from_options(self.options)
-    authenticator = auth.get_authenticator_for_host(
-        'bugs.chromium.org', auth_config)
     # Manually use a long timeout (10m); for some users who have a
     # long history on the issue tracker, whatever the default timeout
     # is is reached.
-    return authenticator.authorize(httplib2.Http(timeout=600))
+    return auth.Authenticator().authorize(httplib2.Http(timeout=600))
 
   def filter_modified_monorail_issue(self, issue):
     """Precisely checks if an issue has been modified in the time range.
@@ -493,7 +332,7 @@ class MyActivity(object):
     http = self.monorail_get_auth_http()
     url = ('https://monorail-prod.appspot.com/_ah/api/monorail/v1/projects'
            '/%s/issues') % project
-    query_data = urllib.urlencode(query)
+    query_data = urllib_parse.urlencode(query)
     url = url + '?' + query_data
     _, body = http.request(url)
     self.show_progress()
@@ -538,8 +377,9 @@ class MyActivity(object):
 
   def monorail_issue_search(self, project):
     epoch = datetime.utcfromtimestamp(0)
-    # TODO(tandrii): support non-chromium email, too.
-    user_str = '%s@chromium.org' % self.user
+    # Defaults to @chromium.org email if one wasn't provided on -u option.
+    user_str = (self.options.email if self.options.email.find('@') >= 0
+                else '%s@chromium.org' % self.user)
 
     issues = self.monorail_query_issues(project, {
       'maxResults': 10000,
@@ -566,8 +406,8 @@ class MyActivity(object):
     })
 
   def print_heading(self, heading):
-    print
-    print self.options.output_format_heading.format(heading=heading)
+    print()
+    print(self.options.output_format_heading.format(heading=heading))
 
   def match(self, author):
     if '@' in self.user:
@@ -644,7 +484,6 @@ class MyActivity(object):
                     title, url, author, created, modified,
                     optional_values=None):
     output_format = specific_fmt if specific_fmt is not None else default_fmt
-    output_format = unicode(output_format)
     values = {
         'title': title,
         'url': url,
@@ -654,8 +493,7 @@ class MyActivity(object):
     }
     if optional_values is not None:
       values.update(optional_values)
-    print DefaultFormatter().format(output_format, **values).encode(
-        sys.getdefaultencoding())
+    print(DefaultFormatter().format(output_format, **values))
 
 
   def filter_issue(self, issue, should_filter_by_user=True):
@@ -692,17 +530,13 @@ class MyActivity(object):
     pass
 
   def get_changes(self):
-    num_instances = len(rietveld_instances) + len(gerrit_instances)
+    num_instances = len(gerrit_instances)
     with contextlib.closing(ThreadPool(num_instances)) as pool:
-      rietveld_changes = pool.map_async(
-          lambda instance: self.rietveld_search(instance, owner=self.user),
-          rietveld_instances)
       gerrit_changes = pool.map_async(
           lambda instance: self.gerrit_search(instance, owner=self.user),
           gerrit_instances)
-      rietveld_changes = itertools.chain.from_iterable(rietveld_changes.get())
       gerrit_changes = itertools.chain.from_iterable(gerrit_changes.get())
-      self.changes = list(rietveld_changes) + list(gerrit_changes)
+      self.changes = list(gerrit_changes)
 
   def print_changes(self):
     if self.changes:
@@ -717,17 +551,13 @@ class MyActivity(object):
         logging.error(error.rstrip())
 
   def get_reviews(self):
-    num_instances = len(rietveld_instances) + len(gerrit_instances)
+    num_instances = len(gerrit_instances)
     with contextlib.closing(ThreadPool(num_instances)) as pool:
-      rietveld_reviews = pool.map_async(
-          lambda instance: self.rietveld_search(instance, reviewer=self.user),
-          rietveld_instances)
       gerrit_reviews = pool.map_async(
           lambda instance: self.gerrit_search(instance, reviewer=self.user),
           gerrit_instances)
-      rietveld_reviews = itertools.chain.from_iterable(rietveld_reviews.get())
       gerrit_reviews = itertools.chain.from_iterable(gerrit_reviews.get())
-      self.reviews = list(rietveld_reviews) + list(gerrit_reviews)
+      self.reviews = list(gerrit_reviews)
 
   def print_reviews(self):
     if self.reviews:
@@ -766,7 +596,7 @@ class MyActivity(object):
       project, issue_id = issue_uid.split(':')
       missing_issues_by_project[project].append(issue_id)
 
-    for project, issue_ids in missing_issues_by_project.iteritems():
+    for project, issue_ids in missing_issues_by_project.items():
       self.referenced_issues += self.monorail_get_issues(project, issue_ids)
 
   def print_issues(self):
@@ -802,25 +632,25 @@ class MyActivity(object):
       if changes_by_issue_uid[issue_uid] or not skip_empty_own:
         self.print_issue(issues[issue_uid])
       if changes_by_issue_uid[issue_uid]:
-        print
+        print()
         for change in changes_by_issue_uid[issue_uid]:
-          print '   ',  # this prints one space due to comma, but no newline
+          print('    ', end='')  # this prints no newline
           self.print_change(change)
-        print
+        print()
 
     # Changes referencing others' issues.
     for issue_uid in ref_issues:
       assert changes_by_ref_issue_uid[issue_uid]
       self.print_issue(ref_issues[issue_uid])
       for change in changes_by_ref_issue_uid[issue_uid]:
-        print '',  # this prints one space due to comma, but no newline
+        print('', end=' ')  # this prints one space due to comma, but no newline
         self.print_change(change)
 
     # Changes referencing no issues.
     if changes_without_issue:
-      print self.options.output_format_no_url.format(title='Other changes')
+      print(self.options.output_format_no_url.format(title='Other changes'))
       for change in changes_without_issue:
-        print '',  # this prints one space due to comma, but no newline
+        print('', end=' ')  # this prints one space due to comma, but no newline
         self.print_change(change)
 
   def print_activity(self):
@@ -839,7 +669,7 @@ class MyActivity(object):
         if not url:
           raise Exception('Dumped item %s does not specify url' % item)
         output[url] = dict(
-            (k, v) for k,v in item.iteritems() if k not in ignore_keys)
+            (k, v) for k,v in item.items() if k not in ignore_keys)
       return output
 
     class PythonObjectEncoder(json.JSONEncoder):
@@ -855,13 +685,10 @@ class MyActivity(object):
       'changes': format_for_json_dump(self.changes),
       'issues': format_for_json_dump(self.issues)
     }
-    print json.dumps(output, indent=2, cls=PythonObjectEncoder)
+    print(json.dumps(output, indent=2, cls=PythonObjectEncoder))
 
 
 def main():
-  # Silence upload.py.
-  rietveld.upload.verbosity = 0
-
   parser = optparse.OptionParser(description=sys.modules[__name__].__doc__)
   parser.add_option(
       '-u', '--user', metavar='<email>',
@@ -903,6 +730,11 @@ def main():
       help='Do not fetch issues referenced by owned changes. Useful in '
            'combination with --changes-by-issue when you only want to list '
            'issues that have also been modified in the same time period.')
+  parser.add_option(
+      '--skip_servers',
+      action='store',
+      default='',
+      help='A comma separated list of gerrit and rietveld servers to ignore')
   parser.add_option(
       '--skip-own-issues-without-changes',
       action='store_true',
@@ -963,7 +795,8 @@ def main():
   output_format_group.add_option(
       '--output-format-heading', metavar='<format>',
       default=u'{heading}:',
-      help='Specifies the format to use when printing headings.')
+      help='Specifies the format to use when printing headings. '
+           'Supports the variable {heading}.')
   output_format_group.add_option(
       '--output-format-no-url', default='{title}',
       help='Specifies the format to use when printing activity without url.')
@@ -975,7 +808,6 @@ def main():
       '-j', '--json', action='store_true',
       help='Output json data (overrides other format options)')
   parser.add_option_group(output_format_group)
-  auth.add_auth_options(parser)
 
   parser.add_option(
       '-v', '--verbose',
@@ -1019,7 +851,9 @@ def main():
     parser.error('Args unsupported')
   if not options.user:
     parser.error('USER/USERNAME is not set, please use -u')
-  options.user = username(options.user)
+  # Retains the original -u option as the email address.
+  options.email = options.user
+  options.user = username(options.email)
 
   logging.basicConfig(level=options.verbosity)
 
@@ -1089,8 +923,8 @@ def main():
       my_activity.get_issues()
     if not options.no_referenced_issues:
       my_activity.get_referenced_issues()
-  except auth.AuthenticationError as e:
-    logging.error('auth.AuthenticationError: %s', e)
+  except auth.LoginRequiredError as e:
+    logging.error('auth.LoginRequiredError: %s', e)
 
   my_activity.show_progress('\n')