libv8 7.8.279.23.0beta1 → 8.4.255.0

data/vendor/depot_tools/fetch_configs/chromium.py

@@ -27,16 +27,18 @@ class Chromium(config_util.Config):
     if ast.literal_eval(props.get('internal', 'False')):
       solution['custom_vars']['checkout_src_internal'] = True
 
-      # TODO(jbudorick): Remove this once crbug.com/803846 and
-      # crbug.com/856278 are complete.
-      solution['custom_vars']['checkout_mobile_internal'] = True
-
       if not ast.literal_eval(props.get('flash', 'False')):
         solution['custom_deps'].update({
             'src/third_party/adobe/flash/binaries/ppapi/linux': None,
             'src/third_party/adobe/flash/binaries/ppapi/linux_x64': None,
+            'src/third_party/adobe/flash/binaries/ppapi/mac_64': None,
+            'src/third_party/adobe/flash/binaries/ppapi/win': None,
+            'src/third_party/adobe/flash/binaries/ppapi/win_x64': None,
             'src/third_party/adobe/flash/symbols/ppapi/linux': None,
             'src/third_party/adobe/flash/symbols/ppapi/linux_x64': None,
+            'src/third_party/adobe/flash/symbols/ppapi/mac_64': None,
+            'src/third_party/adobe/flash/symbols/ppapi/win': None,
+            'src/third_party/adobe/flash/symbols/ppapi/win_x64': None,
         })
     spec = {
       'solutions': [solution],

data/vendor/depot_tools/fetch_configs/devtools-frontend.py

@@ -0,0 +1,44 @@
+# Copyright 2019 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.
+
+import sys
+
+import config_util  # pylint: disable=import-error
+
+
+# This class doesn't need an __init__ method, so we disable the warning
+# pylint: disable=no-init
+class DevToolsFrontend(config_util.Config):
+  """Basic Config class for DevTools frontend."""
+
+  @staticmethod
+  def fetch_spec(props):
+    url = 'https://chromium.googlesource.com/devtools/devtools-frontend.git'
+    solution = {
+        'name'        : 'devtools-frontend',
+        'url'         : url,
+        'deps_file'   : 'DEPS',
+        'managed'     : False,
+        'custom_deps' : {},
+    }
+    spec = {
+      'solutions': [solution],
+      'with_branch_heads': True,
+    }
+    return {
+      'type': 'gclient_git',
+      'gclient_git_spec': spec,
+    }
+
+  @staticmethod
+  def expected_root(_props):
+    return 'devtools-frontend'
+
+
+def main(argv=None):
+  return DevToolsFrontend().handle_args(argv)
+
+
+if __name__ == '__main__':
+  sys.exit(main(sys.argv))

data/vendor/depot_tools/fetch_configs/ios_internal.py

@@ -14,30 +14,21 @@ class IOSInternal(config_util.Config):
 
   @staticmethod
   def fetch_spec(props):
-    url = 'https://chrome-internal.googlesource.com/chrome/ios_internal.git'
-    solution = { 'name'   :'src/ios_internal',
-                 'url'    : url,
-                 'deps_file': 'DEPS',
-                 'managed'   : False,
-                 'custom_deps': {},
-    }
-    spec = {
-      'solutions': [solution],
-    }
-    if props.get('target_os'):
-      spec['target_os'] = props['target_os'].split(',')
-    else:
-      spec['target_os'] = ['ios']
-    if props.get('target_os_only'):
-      spec['target_os_only'] = props['target_os_only']
     return {
-      'type': 'gclient_git',
-      'gclient_git_spec': spec,
+      'alias': {
+        'config': 'chromium',
+        'props': [
+          '--flash=False',
+          '--internal=True',
+          '--target_os=ios',
+          '--target_os_only=True',
+        ],
+      },
     }
 
   @staticmethod
   def expected_root(_props):
-    return 'src'
+    return ''
 
 
 def main(argv=None):

data/vendor/depot_tools/fix_encoding.py

@@ -6,6 +6,8 @@
 multiple platforms with python.
 """
 
+from __future__ import print_function
+
 import codecs
 import locale
 import os
@@ -22,8 +24,9 @@ def complain(message):
   to our wrapper. So be paranoid about catching errors and reporting them
   to sys.__stderr__, so that the user has a higher chance to see them.
   """
-  print >> sys.__stderr__, (
-      isinstance(message, str) and message or repr(message))
+  print(
+      isinstance(message, str) and message or repr(message),
+      file=sys.__stderr__)
 
 
 def fix_default_encoding():
@@ -81,6 +84,10 @@ def fix_win_sys_argv(encoding):
   if _SYS_ARGV_PROCESSED:
     return False
 
+  if sys.version_info.major == 3:
+    _SYS_ARGV_PROCESSED = True
+    return True
+
   # These types are available on linux but not Mac.
   # pylint: disable=no-name-in-module,F0401
   from ctypes import byref, c_int, POINTER, windll, WINFUNCTYPE
@@ -209,9 +216,13 @@ class WinUnicodeConsoleOutput(WinUnicodeOutputBase):
 
   def write(self, text):
     try:
-      if not isinstance(text, unicode):
+      if sys.version_info.major == 2 and not isinstance(text, unicode):
         # Convert to unicode.
         text = str(text).decode(self.encoding, 'replace')
+      elif sys.version_info.major == 3 and isinstance(text, bytes):
+        # Bytestrings need to be decoded to a string before being passed to
+        # Windows.
+        text = text.decode(self.encoding, 'replace')
       remaining = len(text)
       while remaining > 0:
         n = self._DWORD(0)
@@ -239,7 +250,7 @@ class WinUnicodeOutput(WinUnicodeOutputBase):
   """Output adaptor to a file output on Windows.
 
   If the standard FileWrite function is used, it will be encoded in the current
-  code page. WriteConsoleW() permits writting any character.
+  code page. WriteConsoleW() permits writing any character.
   """
   def __init__(self, stream, fileno, encoding):
     super(WinUnicodeOutput, self).__init__(
@@ -259,9 +270,12 @@ class WinUnicodeOutput(WinUnicodeOutputBase):
 
   def write(self, text):
     try:
-      if isinstance(text, unicode):
+      if sys.version_info.major == 2 and isinstance(text, unicode):
         # Replace characters that cannot be printed instead of failing.
         text = text.encode(self.encoding, 'replace')
+      if sys.version_info.major == 3 and isinstance(text, bytes):
+        # Replace characters that cannot be printed instead of failing.
+        text = text.decode(self.encoding, 'replace')
       self._stream.write(text)
     except Exception as e:
       complain('%s.write: %r' % (self.name, e))

data/vendor/depot_tools/gclient

@@ -6,17 +6,33 @@
 base_dir=$(dirname "$0")
 
 if [[ "#grep#fetch#cleanup#diff#setdep#" != *"#$1#"* ]]; then
-  "$base_dir"/update_depot_tools "$@"
-  case $? in
-    123)
-      # msys environment was upgraded, need to quit.
-      exit 0
-      ;;
-    0)
-      ;;
-    *)
-      exit $?
-  esac
+  # Shall skip authomatic update?
+  if [[ $DEPOT_TOOLS_UPDATE != 0 ]]; then
+    "$base_dir"/update_depot_tools "$@"
+    case $? in
+      123)
+        # msys environment was upgraded, need to quit.
+        exit 0
+        ;;
+      0)
+        ;;
+      *)
+        exit $?
+    esac
+  fi
 fi
 
-PYTHONDONTWRITEBYTECODE=1 exec python "$base_dir/gclient.py" "$@"
+# Ensure that "depot_tools" is somewhere in PATH so this tool can be used
+# standalone, but allow other PATH manipulations to take priority.
+PATH=$PATH:$base_dir
+
+if [[ $GCLIENT_PY3 == 1 ]]; then
+  # Explicitly run on Python 3
+  PYTHONDONTWRITEBYTECODE=1 exec vpython3 "$base_dir/gclient.py" "$@"
+elif [[ $GCLIENT_PY3 == 0 ]]; then
+  # Explicitly run on Python 2
+  PYTHONDONTWRITEBYTECODE=1 exec vpython "$base_dir/gclient.py" "$@"
+else
+  # Run on Python 3, allows default to be flipped.
+  PYTHONDONTWRITEBYTECODE=1 exec vpython3 "$base_dir/gclient.py" "$@"
+fi

data/vendor/depot_tools/gclient-new-workdir.py

@@ -7,6 +7,8 @@
 #    gclient-new-workdir.py [options] <repository> <new_workdir>
 #
 
+from __future__ import print_function
+
 import argparse
 import os
 import shutil

data/vendor/depot_tools/gclient.bat

@@ -4,12 +4,29 @@
 :: found in the LICENSE file.
 setlocal
 
+:: Shall skip automatic update?
+IF "%DEPOT_TOOLS_UPDATE%" == "0" GOTO :CALL_GCLIENT
+
 :: Synchronize the root directory before deferring control back to gclient.py.
 call "%~dp0update_depot_tools.bat" %*
+:: Abort the script if we failed to update depot_tools.
+IF %errorlevel% NEQ 0 (
+  goto :EOF
+)
 
+:CALL_GCLIENT
 :: Ensure that "depot_tools" is somewhere in PATH so this tool can be used
 :: standalone, but allow other PATH manipulations to take priority.
 set PATH=%PATH%;%~dp0
 
 :: Defer control.
-python "%~dp0gclient.py" %*
+IF "%GCLIENT_PY3%" == "1" (
+  :: Explicitly run on Python 3
+  call vpython3 "%~dp0gclient.py" %*
+) ELSE IF "%GCLIENT_PY3%" == "0" (
+  :: Explicitly run on Python 2
+  call vpython "%~dp0gclient.py" %*
+) ELSE (
+  :: Run on Python 3, allows default to be flipped.
+  call vpython3 "%~dp0gclient.py" %*
+)

data/vendor/depot_tools/gclient.py

@@ -78,7 +78,7 @@
 #
 # Specifying a target CPU
 #   To specify a target CPU, the variables target_cpu and target_cpu_only
-#   are available and are analagous to target_os and target_os_only.
+#   are available and are analogous to target_os and target_os_only.
 
 from __future__ import print_function
 
@@ -116,11 +116,10 @@ import subcommand
 import subprocess2
 import setup_color
 
+from third_party import six
 
 # TODO(crbug.com/953884): Remove this when python3 migration is done.
-try:
-  basestring
-except NameError:
+if six.PY3:
   # pylint: disable=redefined-builtin
   basestring = str
 
@@ -242,17 +241,15 @@ class Hook(object):
     cmd = [arg for arg in self._action]
 
     if cmd[0] == 'python':
-      # If the hook specified "python" as the first item, the action is a
-      # Python script.  Run it by starting a new copy of the same
-      # interpreter.
-      cmd[0] = sys.executable
-    elif cmd[0] == 'vpython' and _detect_host_os() == 'win':
+      cmd[0] = 'vpython'
+    if cmd[0] == 'vpython' and _detect_host_os() == 'win':
       cmd[0] += '.bat'
 
     try:
       start_time = time.time()
-      gclient_utils.CheckCallAndFilterAndHeader(
-          cmd, cwd=self.effective_cwd, always=self._verbose)
+      gclient_utils.CheckCallAndFilter(
+          cmd, cwd=self.effective_cwd, print_stdout=True, show_header=True,
+          always_show_header=self._verbose)
     except (gclient_utils.Error, subprocess2.CalledProcessError) as e:
       # Use a discrete exit status code of 2 to indicate that a hook action
       # failed.  Users of this script may wish to treat hook action failures
@@ -430,6 +427,8 @@ class Dependency(gclient_utils.WorkItem, DependencySettings):
     # The actual revision we ended up getting, or None if that information is
     # unavailable
     self._got_revision = None
+    # Whether this dependency should use relative paths.
+    self._use_relative_paths = False
 
     # recursedeps is a mutable value that selectively overrides the default
     # 'no recursion' setting on a dep-by-dep basis.
@@ -461,29 +460,46 @@ class Dependency(gclient_utils.WorkItem, DependencySettings):
       logging.info('Dependency(%s)._OverrideUrl(%s) -> %s', self._name,
                    self.url, parsed_url)
       self.set_url(parsed_url)
+      return
 
-    elif isinstance(self.url, basestring):
-      parsed_url = urlparse.urlparse(self.url)
-      if (not parsed_url[0] and
-          not re.match(r'^\w+\@[\w\.-]+\:[\w\/]+', parsed_url[2])):
-        path = parsed_url[2]
-        if not path.startswith('/'):
-          raise gclient_utils.Error(
-              'relative DEPS entry \'%s\' must begin with a slash' % self.url)
-        # A relative url. Get the parent url, strip from the last '/'
-        # (equivalent to unix basename), and append the relative url.
-        parent_url = self.parent.url
-        parsed_url = parent_url[:parent_url.rfind('/')] + self.url
-        logging.info('Dependency(%s)._OverrideUrl(%s) -> %s', self.name,
-                     self.url, parsed_url)
-        self.set_url(parsed_url)
-
-    elif self.url is None:
+    if self.url is None:
       logging.info('Dependency(%s)._OverrideUrl(None) -> None', self._name)
+      return
 
-    else:
+    if not isinstance(self.url, basestring):
       raise gclient_utils.Error('Unknown url type')
 
+    # self.url is a local path
+    path, at, rev = self.url.partition('@')
+    if os.path.isdir(path):
+      return
+
+    # self.url is a URL
+    parsed_url = urlparse.urlparse(self.url)
+    if parsed_url[0] or re.match(r'^\w+\@[\w\.-]+\:[\w\/]+', parsed_url[2]):
+      return
+
+    # self.url is relative to the parent's URL.
+    if not path.startswith('/'):
+      raise gclient_utils.Error(
+          'relative DEPS entry \'%s\' must begin with a slash' % self.url)
+
+    parent_url = self.parent.url
+    parent_path = self.parent.url.split('@')[0]
+    if os.path.isdir(parent_path):
+      # Parent's URL is a local path. Get parent's URL dirname and append
+      # self.url.
+      parent_path = os.path.dirname(parent_path)
+      parsed_url = parent_path + path.replace('/', os.sep) + at + rev
+    else:
+      # Parent's URL is a URL. Get parent's URL, strip from the last '/'
+      # (equivalent to unix dirname) and append self.url.
+      parsed_url = parent_url[:parent_url.rfind('/')] + self.url
+
+    logging.info('Dependency(%s)._OverrideUrl(%s) -> %s', self.name,
+                 self.url, parsed_url)
+    self.set_url(parsed_url)
+
   def PinToActualRevision(self):
     """Updates self.url to the revision checked out on disk."""
     if self.url is None:
@@ -524,7 +540,7 @@ class Dependency(gclient_utils.WorkItem, DependencySettings):
     # thus unsorted, while the .gclient format is a list thus sorted.
     #
     # Interestingly enough, the following condition only works in the case we
-    # want: self is a 2nd level node. 3nd level node wouldn't need this since
+    # want: self is a 2nd level node. 3rd level node wouldn't need this since
     # they already have their parent as a requirement.
     if self.parent and self.parent.parent and not self.parent.parent.parent:
       requirements |= set(i.name for i in self.root.dependencies if i.name)
@@ -575,7 +591,7 @@ class Dependency(gclient_utils.WorkItem, DependencySettings):
               self.url))
       # In theory we could keep it as a shadow of the other one. In
       # practice, simply ignore it.
-      logging.warn('Won\'t process duplicate dependency %s' % sibling)
+      logging.warning("Won't process duplicate dependency %s" % sibling)
       return False
     return True
 
@@ -597,7 +613,7 @@ class Dependency(gclient_utils.WorkItem, DependencySettings):
     # recursively included by "src/ios_foo/DEPS" should also require
     # "checkout_ios=True".
     if self.condition:
-      for value in deps.itervalues():
+      for value in deps.values():
         gclient_eval.UpdateCondition(value, 'and', self.condition)
 
     if rel_prefix:
@@ -695,8 +711,7 @@ class Dependency(gclient_utils.WorkItem, DependencySettings):
     if deps_content:
       try:
         local_scope = gclient_eval.Parse(
-            deps_content, self._get_option('validate_syntax', False),
-            filepath, self.get_vars(), self.get_builtin_vars())
+            deps_content, filepath, self.get_vars(), self.get_builtin_vars())
       except SyntaxError as e:
         gclient_utils.SyntaxErrorToError(filepath, e)
 
@@ -738,9 +753,9 @@ class Dependency(gclient_utils.WorkItem, DependencySettings):
     # (and therefore set self.relative on this Dependency object), then we
     # want to modify the deps and recursedeps by prepending the parent
     # directory of this dependency.
-    use_relative_paths = local_scope.get('use_relative_paths', False)
+    self._use_relative_paths = local_scope.get('use_relative_paths', False)
     rel_prefix = None
-    if use_relative_paths:
+    if self._use_relative_paths:
       rel_prefix = self.name
     elif self._relative:
       rel_prefix = os.path.dirname(self.name)
@@ -775,13 +790,13 @@ class Dependency(gclient_utils.WorkItem, DependencySettings):
 
     deps = local_scope.get('deps', {})
     deps_to_add = self._deps_to_objects(
-        self._postprocess_deps(deps, rel_prefix), use_relative_paths)
+        self._postprocess_deps(deps, rel_prefix), self._use_relative_paths)
 
     # compute which working directory should be used for hooks
     use_relative_hooks = local_scope.get('use_relative_hooks', False)
     hooks_cwd = self.root.root_dir
     if use_relative_hooks:
-      if not use_relative_paths:
+      if not self._use_relative_paths:
         raise gclient_utils.Error(
             'ParseDepsFile(%s): use_relative_hooks must be used with '
             'use_relative_paths' % self.name)
@@ -1018,11 +1033,19 @@ class Dependency(gclient_utils.WorkItem, DependencySettings):
     variables = self.get_vars()
     for arg in self._gn_args:
       value = variables[arg]
-      if isinstance(value, basestring):
+      if isinstance(value, gclient_eval.ConstantString):
+        value = value.value
+      elif isinstance(value, basestring):
         value = gclient_eval.EvaluateCondition(value, variables)
       lines.append('%s = %s' % (arg, ToGNString(value)))
-    with open(os.path.join(self.root.root_dir, self._gn_args_file), 'w') as f:
-      f.write('\n'.join(lines))
+
+    # When use_relative_paths is set, gn_args_file is relative to this DEPS
+    path_prefix = self.root.root_dir
+    if self._use_relative_paths:
+      path_prefix = os.path.join(path_prefix, self.name)
+
+    with open(os.path.join(path_prefix, self._gn_args_file), 'wb') as f:
+      f.write('\n'.join(lines).encode('utf-8', 'replace'))
 
   @gclient_utils.lockedmethod
   def _run_is_done(self, file_list):
@@ -1240,11 +1263,11 @@ class Dependency(gclient_utils.WorkItem, DependencySettings):
     result = {}
     result.update(self._vars)
     if self.parent:
-      parent_vars = self.parent.get_vars()
-      result.update(parent_vars)
+      merge_vars(result, self.parent.get_vars())
     # Provide some built-in variables.
     result.update(self.get_builtin_vars())
-    result.update(self.custom_vars or {})
+    merge_vars(result, self.custom_vars)
+
     return result
 
 
@@ -1252,11 +1275,26 @@ _PLATFORM_MAPPING = {
   'cygwin': 'win',
   'darwin': 'mac',
   'linux2': 'linux',
+  'linux': 'linux',
   'win32': 'win',
   'aix6': 'aix',
 }
 
 
+def merge_vars(result, new_vars):
+  for k, v in new_vars.items():
+    if k in result:
+      if isinstance(result[k], gclient_eval.ConstantString):
+        if isinstance(v, gclient_eval.ConstantString):
+          result[k] = v
+        else:
+          result[k].value = v
+      else:
+        result[k] = v
+    else:
+      result[k] = v
+
+
 def _detect_host_os():
   return _PLATFORM_MAPPING[sys.platform]
 
@@ -1300,10 +1338,10 @@ class GClient(GitDependency):
 
   DEFAULT_CLIENT_FILE_TEXT = ("""\
 solutions = [
-  { "name"        : "%(solution_name)s",
-    "url"         : "%(solution_url)s",
-    "deps_file"   : "%(deps_file)s",
-    "managed"     : %(managed)s,
+  { "name"        : %(solution_name)r,
+    "url"         : %(solution_url)r,
+    "deps_file"   : %(deps_file)r,
+    "managed"     : %(managed)r,
     "custom_deps" : {
     },
     "custom_vars": %(custom_vars)r,
@@ -1346,7 +1384,7 @@ solutions = %(solution_list)s
     else:
       enforced_os = [self.DEPS_OS_CHOICES.get(sys.platform, 'unix')]
     if 'all' in enforced_os:
-      enforced_os = self.DEPS_OS_CHOICES.itervalues()
+      enforced_os = self.DEPS_OS_CHOICES.values()
     self._enforced_os = tuple(set(enforced_os))
     self._enforced_cpu = detect_host_arch.HostArch(),
     self._root_dir = root_dir
@@ -1381,12 +1419,14 @@ The local checkout in %(checkout_path)s reports:
 
 You should ensure that the URL listed in .gclient is correct and either change
 it or fix the checkout.
-'''  % {'checkout_path': os.path.join(self.root_dir, dep.name),
-        'expected_url': dep.url,
-        'expected_scm': dep.GetScmName(),
-        'mirror_string': mirror_string,
-        'actual_url': actual_url,
-        'actual_scm': dep.GetScmName()})
+''' % {
+                  'checkout_path': os.path.join(self.root_dir, dep.name),
+                  'expected_url': dep.url,
+                  'expected_scm': dep.GetScmName(),
+                  'mirror_string': mirror_string,
+                  'actual_url': actual_url,
+                  'actual_scm': dep.GetScmName()
+              })
 
   def SetConfig(self, content):
     assert not self.dependencies
@@ -1450,7 +1490,7 @@ it or fix the checkout.
     metrics.collector.add(
         'project_urls',
         [
-            dep.url if not dep.url.endswith('.git') else dep.url[:-len('.git')]
+            dep.FuzzyMatchUrl(metrics_utils.KNOWN_PROJECT_URLS)
             for dep in deps_to_add
             if dep.FuzzyMatchUrl(metrics_utils.KNOWN_PROJECT_URLS)
         ]
@@ -1574,13 +1614,12 @@ it or fix the checkout.
       return patch_refs, target_branches
     for given_patch_ref in self._options.patch_refs:
       patch_repo, _, patch_ref = given_patch_ref.partition('@')
-      if not patch_repo or not patch_ref:
+      if not patch_repo or not patch_ref or ':' not in patch_ref:
         raise gclient_utils.Error(
             'Wrong revision format: %s should be of the form '
-            'patch_repo@[target_branch:]patch_ref.' % given_patch_ref)
-      if ':' in patch_ref:
-        target_branch, _, patch_ref = patch_ref.partition(':')
-        target_branches[patch_repo] = target_branch
+            'patch_repo@target_branch:patch_ref.' % given_patch_ref)
+      target_branch, _, patch_ref = patch_ref.partition(':')
+      target_branches[patch_repo] = target_branch
       patch_refs[patch_repo] = patch_ref
     return patch_refs, target_branches
 
@@ -1650,12 +1689,11 @@ it or fix the checkout.
               # clean checkout.
               gclient_scm.scm.GIT.CleanupDir(par_scm_root, rel_e_dir)
               assert not os.path.exists(os.path.join(e_dir, '.git'))
-              print(('\nWARNING: \'%s\' has been moved from DEPS to a higher '
-                     'level checkout. The git folder containing all the local'
-                     ' branches has been saved to %s.\n'
-                     'If you don\'t care about its state you can safely '
-                     'remove that folder to free up space.') %
-                    (entry, save_dir))
+              print('\nWARNING: \'%s\' has been moved from DEPS to a higher '
+                    'level checkout. The git folder containing all the local'
+                    ' branches has been saved to %s.\n'
+                    'If you don\'t care about its state you can safely '
+                    'remove that folder to free up space.' % (entry, save_dir))
               continue
 
         if scm_root in full_entries:
@@ -1684,9 +1722,16 @@ it or fix the checkout.
                   should_recurse=False,
                   relative=None,
                   condition=None))
-          print(('\nWARNING: \'%s\' is no longer part of this client.\n'
-                 'It is recommended that you manually remove it or use '
-                 '\'gclient sync -D\' next time.') % entry_fixed)
+          if modified_files and self._options.delete_unversioned_trees:
+            print('\nWARNING: \'%s\' is no longer part of this client.\n'
+                  'Despite running \'gclient sync -D\' no action was taken '
+                  'as there are modifications.\nIt is recommended you revert '
+                  'all changes or run \'gclient sync -D --force\' next '
+                  'time.' % entry_fixed)
+          else:
+            print('\nWARNING: \'%s\' is no longer part of this client.\n'
+                  'It is recommended that you manually remove it or use '
+                  '\'gclient sync -D\' next time.' % entry_fixed)
         else:
           # Delete the entry
           print('\n________ deleting \'%s\' in \'%s\'' % (
@@ -1744,7 +1789,7 @@ it or fix the checkout.
           'The following --patch-ref flags were not used. Please fix it:\n%s' %
           ('\n'.join(
               patch_repo + '@' + patch_ref
-              for patch_repo, patch_ref in patch_refs.iteritems())))
+              for patch_repo, patch_ref in patch_refs.items())))
 
     # Once all the dependencies have been processed, it's now safe to write
     # out the gn_args_file and run the hooks.
@@ -1831,7 +1876,7 @@ it or fix the checkout.
                 'url': rev.split('@')[0] if rev else None,
                 'rev': rev.split('@')[1] if rev and '@' in rev else None,
             }
-            for name, rev in entries.iteritems()
+            for name, rev in entries.items()
         }
         if self._options.output_json == '-':
           print(json.dumps(json_output, indent=2, separators=(',', ': ')))
@@ -1979,7 +2024,7 @@ class CipdDependency(Dependency):
       ])
       for p in sorted(
           self._cipd_root.packages(self._cipd_subdir),
-          cmp=lambda x, y: cmp(x.name, y.name)):
+          key=lambda x: x.name):
         s.extend([
             '      {',
             '        "package": "%s",' % escape_cipd_var(p.name),
@@ -2119,7 +2164,7 @@ class Flattener(object):
       self._flatten_dep(solution)
 
     if pin_all_deps:
-      for dep in self._deps.itervalues():
+      for dep in self._deps.values():
         self._pin_dep(dep)
 
     def add_deps_file(dep):
@@ -2137,7 +2182,7 @@ class Flattener(object):
           return
       assert dep.url
       self._deps_files.add((dep.url, deps_file, dep.hierarchy_data()))
-    for dep in self._deps.itervalues():
+    for dep in self._deps.values():
       add_deps_file(dep)
 
     gn_args_dep = self._deps.get(self._client.dependencies[0]._gn_args_from,
@@ -2180,7 +2225,7 @@ class Flattener(object):
     # Only include vars explicitly listed in the DEPS files or gclient solution,
     # not automatic, local overrides (i.e. not all of dep.get_vars()).
     hierarchy = dep.hierarchy(include_url=False)
-    for key, value in dep._vars.iteritems():
+    for key, value in dep._vars.items():
       # Make sure there are no conflicting variables. It is fine however
       # to use same variable name, as long as the value is consistent.
       assert key not in self._vars or self._vars[key][1] == value, (
@@ -2188,7 +2233,7 @@ class Flattener(object):
           dep.name, key, value, self._vars[key][1]))
       self._vars[key] = (hierarchy, value)
     # Override explicit custom variables.
-    for key, value in dep.custom_vars.iteritems():
+    for key, value in dep.custom_vars.items():
       # Do custom_vars that don't correspond to DEPS vars ever make sense? DEPS
       # conditionals shouldn't be using vars that aren't also defined in the
       # DEPS (presubmit actually disallows this), so any new custom_var must be
@@ -2279,7 +2324,7 @@ def _DepsToLines(deps):
   if not deps:
     return []
   s = ['deps = {']
-  for _, dep in sorted(deps.iteritems()):
+  for _, dep in sorted(deps.items()):
     s.extend(dep.ToLines())
   s.extend(['}', ''])
   return s
@@ -2290,9 +2335,9 @@ def _DepsOsToLines(deps_os):
   if not deps_os:
     return []
   s = ['deps_os = {']
-  for dep_os, os_deps in sorted(deps_os.iteritems()):
+  for dep_os, os_deps in sorted(deps_os.items()):
     s.append('  "%s": {' % dep_os)
-    for name, dep in sorted(os_deps.iteritems()):
+    for name, dep in sorted(os_deps.items()):
       condition_part = (['      "condition": %r,' % dep.condition]
                         if dep.condition else [])
       s.extend([
@@ -2341,7 +2386,7 @@ def _HooksOsToLines(hooks_os):
   if not hooks_os:
     return []
   s = ['hooks_os = {']
-  for hook_os, os_hooks in hooks_os.iteritems():
+  for hook_os, os_hooks in hooks_os.items():
     s.append('  "%s": [' % hook_os)
     for dep, hook in os_hooks:
       s.extend([
@@ -2372,7 +2417,7 @@ def _VarsToLines(variables):
   if not variables:
     return []
   s = ['vars = {']
-  for key, tup in sorted(variables.iteritems()):
+  for key, tup in sorted(variables.items()):
     hierarchy, value = tup
     s.extend([
         '  # %s' % hierarchy,
@@ -2599,7 +2644,7 @@ def CMDsync(parser, args):
   parser.add_option('--patch-ref', action='append',
                     dest='patch_refs', metavar='GERRIT_REF', default=[],
                     help='Patches the given reference with the format '
-                         'dep@[target-ref:]patch-ref. '
+                         'dep@target-ref:patch-ref. '
                          'For |dep|, you can specify URLs as well as paths, '
                          'with URLs taking preference. '
                          '|patch-ref| will be applied to |dep|, rebased on top '
@@ -2609,10 +2654,7 @@ def CMDsync(parser, args):
                          '|target-ref| is the target branch against which a '
                          'patch was created, it is used to determine which '
                          'commits from the |patch-ref| actually constitute a '
-                         'patch. If not given, we will iterate over all remote '
-                         'branches and select one that contains the revision '
-                         '|dep| is synced at. '
-                         'WARNING: |target-ref| will be mandatory soon.')
+                         'patch.')
   parser.add_option('--with_branch_heads', action='store_true',
                     help='Clone git "branch_heads" refspecs in addition to '
                          'the default refspecs. This adds about 1/2GB to a '
@@ -2659,27 +2701,15 @@ def CMDsync(parser, args):
   parser.add_option('--no_bootstrap', '--no-bootstrap',
                     action='store_true',
                     help='Don\'t bootstrap from Google Storage.')
-  parser.add_option('--ignore_locks', action='store_true',
-                    help='GIT ONLY - Ignore cache locks.')
-  parser.add_option('--break_repo_locks', action='store_true',
-                    help='GIT ONLY - Forcibly remove repo locks (e.g. '
-                      'index.lock). This should only be used if you know for '
-                      'certain that this invocation of gclient is the only '
-                      'thing operating on the git repos (e.g. on a bot).')
+  parser.add_option('--ignore_locks',
+                    action='store_true',
+                    help='No longer used.')
+  parser.add_option('--break_repo_locks',
+                    action='store_true',
+                    help='No longer used.')
   parser.add_option('--lock_timeout', type='int', default=5000,
                     help='GIT ONLY - Deadline (in seconds) to wait for git '
                          'cache lock to become available. Default is %default.')
-  # TODO(agable): Remove these when the oldest CrOS release milestone is M56.
-  parser.add_option('-t', '--transitive', action='store_true',
-                    help='DEPRECATED: This is a no-op.')
-  parser.add_option('-m', '--manually_grab_svn_rev', action='store_true',
-                    help='DEPRECATED: This is a no-op.')
-  # TODO(phajdan.jr): Remove validation options once default (crbug/570091).
-  parser.add_option('--validate-syntax', action='store_true', default=True,
-                    help='Validate the .gclient and DEPS syntax')
-  parser.add_option('--disable-syntax-validation', action='store_false',
-                    dest='validate_syntax',
-                    help='Disable validation of .gclient and DEPS syntax.')
   parser.add_option('--no-rebase-patch-ref', action='store_false',
                     dest='rebase_patch_ref', default=True,
                     help='Bypass rebase of the patch ref after checkout.')
@@ -2692,6 +2722,13 @@ def CMDsync(parser, args):
   if not client:
     raise gclient_utils.Error('client not configured; see \'gclient config\'')
 
+  if options.ignore_locks:
+    print('Warning: ignore_locks is no longer used. Please remove its usage.')
+
+  if options.break_repo_locks:
+    print('Warning: break_repo_locks is no longer used. Please remove its '
+          'usage.')
+
   if options.revisions and options.head:
     # TODO(maruel): Make it a parser.error if it doesn't break any builder.
     print('Warning: you cannot use both --head and --revision')
@@ -2709,7 +2746,7 @@ def CMDsync(parser, args):
           'url': str(d.url) if d.url else None,
           'was_processed': d.should_process,
       }
-    with open(options.output_json, 'wb') as f:
+    with open(options.output_json, 'w') as f:
       json.dump({'solutions': slns}, f)
   return ret
 
@@ -2721,7 +2758,6 @@ CMDupdate = CMDsync
 def CMDvalidate(parser, args):
   """Validates the .gclient and DEPS syntax."""
   options, args = parser.parse_args(args)
-  options.validate_syntax = True
   client = GClient.LoadCurrentConfig(options)
   rv = client.RunOnDeps('validate', args)
   if rv == 0:
@@ -2763,12 +2799,14 @@ def CMDrevert(parser, args):
                     help='don\'t run pre-DEPS hooks', default=False)
   parser.add_option('--upstream', action='store_true',
                     help='Make repo state match upstream branch.')
-  parser.add_option('--break_repo_locks', action='store_true',
-                    help='GIT ONLY - Forcibly remove repo locks (e.g. '
-                      'index.lock). This should only be used if you know for '
-                      'certain that this invocation of gclient is the only '
-                      'thing operating on the git repos (e.g. on a bot).')
+  parser.add_option('--break_repo_locks',
+                    action='store_true',
+                    help='No longer used.')
   (options, args) = parser.parse_args(args)
+  if options.break_repo_locks:
+    print('Warning: break_repo_locks is no longer used. Please remove its ' +
+          'usage.')
+
   # --force is implied.
   options.force = True
   options.reset = False
@@ -2864,7 +2902,7 @@ def CMDgetdep(parser, args):
   if client is not None:
     builtin_vars = client.get_builtin_vars()
   else:
-    logging.warn(
+    logging.warning(
         'Couldn\'t find a valid gclient config. Will attempt to parse the DEPS '
         'file without support for built-in variables.')
     builtin_vars = None
@@ -2924,7 +2962,7 @@ def CMDsetdep(parser, args):
   if client is not None:
     builtin_vars = client.get_builtin_vars()
   else:
-    logging.warn(
+    logging.warning(
         'Couldn\'t find a valid gclient config. Will attempt to parse the DEPS '
         'file without support for built-in variables.')
     builtin_vars = None
@@ -2957,8 +2995,8 @@ def CMDsetdep(parser, args):
     else:
       gclient_eval.SetRevision(local_scope, name, value)
 
-  with open(options.deps_file, 'w') as f:
-    f.write(gclient_eval.RenderDEPSFile(local_scope))
+  with open(options.deps_file, 'wb') as f:
+    f.write(gclient_eval.RenderDEPSFile(local_scope).encode('utf-8'))
 
 
 @metrics.collector.collect_metrics('gclient verify')
@@ -3058,14 +3096,14 @@ class OptionParser(optparse.OptionParser):
     # Store the options passed by the user in an _actual_options attribute.
     # We store only the keys, and not the values, since the values can contain
     # arbitrary information, which might be PII.
-    metrics.collector.add('arguments', actual_options.__dict__.keys())
+    metrics.collector.add('arguments', list(actual_options.__dict__))
 
     levels = [logging.ERROR, logging.WARNING, logging.INFO, logging.DEBUG]
     logging.basicConfig(
         level=levels[min(options.verbose, len(levels) - 1)],
         format='%(module)s(%(lineno)d) %(funcName)s:%(message)s')
     if options.config_filename and options.spec:
-      self.error('Cannot specifiy both --gclientfile and --spec')
+      self.error('Cannot specify both --gclientfile and --spec')
     if (options.config_filename and
         options.config_filename != os.path.basename(options.config_filename)):
       self.error('--gclientfile target must be a filename, not a path')