libv8 4.5.95.5 → 5.0.71.48.0beta2

data/vendor/depot_tools/{recipes → fetch_configs}/webrtc.py

@@ -4,13 +4,13 @@
 
 import sys
 
-import recipe_util  # pylint: disable=F0401
+import config_util  # pylint: disable=F0401
 
 
 # This class doesn't need an __init__ method, so we disable the warning
 # pylint: disable=W0232
-class WebRTC(recipe_util.Recipe):
-  """Basic Recipe class for WebRTC."""
+class WebRTC(config_util.Config):
+  """Basic Config class for WebRTC."""
 
   @staticmethod
   def fetch_spec(props):

data/vendor/depot_tools/{recipes → fetch_configs}/webrtc_android.py

@@ -4,19 +4,19 @@
 
 import sys
 
-import recipe_util  # pylint: disable=F0401
+import config_util  # pylint: disable=F0401
 
 
 # This class doesn't need an __init__ method, so we disable the warning
 # pylint: disable=W0232
-class WebRTCAndroid(recipe_util.Recipe):
-  """Basic Recipe alias for Android -> WebRTC."""
+class WebRTCAndroid(config_util.Config):
+  """Basic Config alias for Android -> WebRTC."""
 
   @staticmethod
   def fetch_spec(props):
     return {
       'alias': {
-        'recipe': 'webrtc',
+        'config': 'webrtc',
         'props': ['--target_os=android,unix'],
       },
     }

data/vendor/depot_tools/{recipes → fetch_configs}/webrtc_ios.py

@@ -4,19 +4,19 @@
 
 import sys
 
-import recipe_util  # pylint: disable=F0401
+import config_util  # pylint: disable=F0401
 
 
 # This class doesn't need an __init__ method, so we disable the warning
 # pylint: disable=W0232
-class WebRTCIOS(recipe_util.Recipe):
-  """Basic Recipe alias for iOS -> WebRTC."""
+class WebRTCIOS(config_util.Config):
+  """Basic Config alias for iOS -> WebRTC."""
 
   @staticmethod
   def fetch_spec(props):
     return {
       'alias': {
-        'recipe': 'webrtc',
+        'config': 'webrtc',
         'props': ['--target_os=ios,mac'],
       },
     }

data/vendor/depot_tools/fix_encoding.py

@@ -51,7 +51,7 @@ def fix_default_encoding():
     except locale.Error:
       continue
     try:
-      lang = locale.getlocale(aref)[0]
+      lang, _ = locale.getdefaultlocale()
     except (TypeError, ValueError):
       continue
     if lang:
@@ -171,7 +171,7 @@ class WinUnicodeOutputBase(object):
     try:
       for line in lines:
         self.write(line)
-    except Exception, e:
+    except Exception as e:
       complain('%s.writelines: %r' % (self.name, e))
       raise
 
@@ -230,7 +230,7 @@ class WinUnicodeConsoleOutput(WinUnicodeOutputBase):
         if not remaining:
           break
         text = text[int(n.value):]
-    except Exception, e:
+    except Exception as e:
       complain('%s.write: %r' % (self.name, e))
       raise
 
@@ -253,7 +253,7 @@ class WinUnicodeOutput(WinUnicodeOutputBase):
   def flush(self):
     try:
       self._stream.flush()
-    except Exception, e:
+    except Exception as e:
       complain('%s.flush: %r from %r' % (self.name, e, self._stream))
       raise
 
@@ -263,7 +263,7 @@ class WinUnicodeOutput(WinUnicodeOutputBase):
         # Replace characters that cannot be printed instead of failing.
         text = text.encode(self.encoding, 'replace')
       self._stream.write(text)
-    except Exception, e:
+    except Exception as e:
       complain('%s.write: %r' % (self.name, e))
       raise
 
@@ -348,7 +348,7 @@ def fix_win_console(encoding):
     # TODO(maruel): Do sys.stdin with ReadConsoleW(). Albeit the limitation is
     # "It doesn't appear to be possible to read Unicode characters in UTF-8
     # mode" and this appears to be a limitation of cmd.exe.
-  except Exception, e:
+  except Exception as e:
     complain('exception %r while fixing up sys.stdout and sys.stderr' % e)
   return True
 

data/vendor/depot_tools/gcl.py

@@ -20,8 +20,6 @@ import tempfile
 import time
 import urllib2
 
-import breakpad  # pylint: disable=W0611
-
 
 import auth
 import fix_encoding
@@ -47,8 +45,10 @@ CODEREVIEW_SETTINGS = {
 # we store information about changelists.
 REPOSITORY_ROOT = ""
 
-# Replacement for project name.
-SWITCH_TO_GIT = "SWITCH_TO_GIT_ALREADY"
+# Printed when people upload patches using svn.
+SWITCH_TO_GIT = """You're using svn to work on depot_tools.
+Consider switching to git today, so that you're ready when svn stops working
+and you need a functional checkout for a future fire."""
 
 # Filename where we store repository specific information for gcl.
 CODEREVIEW_SETTINGS_FILE = "codereview.settings"
@@ -69,15 +69,9 @@ def CheckHomeForFile(filename):
   """Checks the users home dir for the existence of the given file.  Returns
   the path to the file if it's there, or None if it is not.
   """
-  home_vars = ['HOME']
-  if sys.platform in ('cygwin', 'win32'):
-    home_vars.append('USERPROFILE')
-  for home_var in home_vars:
-    home = os.getenv(home_var)
-    if home != None:
-      full_path = os.path.join(home, filename)
-      if os.path.exists(full_path):
-        return full_path
+  full_path = os.path.expanduser(os.path.join('~', filename))
+  if os.path.exists(full_path):
+    return full_path
   return None
 
 
@@ -747,12 +741,6 @@ def GetTreeStatus():
 
 def OptionallyDoPresubmitChecks(change_info, committing, args):
   if FilterFlag(args, "--no_presubmit") or FilterFlag(args, "--force"):
-    breakpad.SendStack(
-        breakpad.DEFAULT_URL + '/breakpad',
-        'GclHooksBypassedCommit',
-        'Issue %s/%s bypassed hook when committing (tree status was "%s")' %
-        (change_info.rietveld, change_info.issue, GetTreeStatus()),
-        verbose=False)
     return presubmit_support.PresubmitOutput()
   return DoPresubmitChecks(change_info, committing, True)
 
@@ -884,7 +872,8 @@ def CMDupload(change_info, args):
 
       project = GetCodeReviewSetting("PROJECT")
       if project:
-        upload_arg.append("--project=%s" % SWITCH_TO_GIT)
+        print SWITCH_TO_GIT
+        upload_arg.append("--project=%s" % project)
 
       if not any(i.startswith('--title') or i.startswith('-t') for i in args):
         upload_arg.append('--title= ')
@@ -926,7 +915,8 @@ def CMDupload(change_info, args):
 
       project = GetCodeReviewSetting("PROJECT")
       if project:
-        upload_arg.append("--project=%s" % SWITCH_TO_GIT)
+        print SWITCH_TO_GIT
+        upload_arg.append("--project=%s" % project)
 
     # If we have a lot of files with long paths, then we won't be able to fit
     # the command to "svn diff".  Instead, we generate the diff manually for

data/vendor/depot_tools/gclient

@@ -7,6 +7,16 @@ base_dir=$(dirname "$0")
 
 if [[ "#grep#fetch#cleanup#diff#" != *"#$1#"* ]]; then
   "$base_dir"/update_depot_tools "$@"
+  case $? in
+    123)
+      # msys environment was upgraded, need to quit.
+      exit 0
+      ;;
+    0)
+      ;;
+    *)
+      exit $?
+  esac
 fi
 
 PYTHONDONTWRITEBYTECODE=1 exec python "$base_dir/gclient.py" "$@"

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

@@ -13,6 +13,8 @@ import subprocess
 import sys
 import textwrap
 
+import git_common
+
 
 def print_err(msg):
   print >> sys.stderr, msg
@@ -32,7 +34,7 @@ def usage(msg=None):
 
     <repository> should contain a .gclient file
     <new_workdir> must not exist
-    ''' % os.path.basename(sys.argv[0])
+    '''% os.path.basename(sys.argv[0])
 
   print_err(textwrap.dedent(usage_msg))
   sys.exit(1)
@@ -70,43 +72,10 @@ def main():
   for root, dirs, _ in os.walk(repository):
     if '.git' in dirs:
       workdir = root.replace(repository, new_workdir, 1)
-      make_workdir(os.path.join(root, '.git'),
-                   os.path.join(workdir, '.git'))
-
-
-def make_workdir(repository, new_workdir):
-  print('Creating: ' + new_workdir)
-  os.makedirs(new_workdir)
-
-  GIT_DIRECTORY_WHITELIST = [
-    'config',
-    'info',
-    'hooks',
-    'logs/refs',
-    'objects',
-    'packed-refs',
-    'refs',
-    'remotes',
-    'rr-cache',
-    'svn'
-  ]
-
-  for entry in GIT_DIRECTORY_WHITELIST:
-    make_symlink(repository, new_workdir, entry)
-
-  shutil.copy2(os.path.join(repository, 'HEAD'),
-               os.path.join(new_workdir, 'HEAD'))
-  subprocess.check_call(['git', 'checkout', '-f'],
-                        cwd=new_workdir.rstrip('.git'))
-
-
-def make_symlink(repository, new_workdir, link):
-  if not os.path.exists(os.path.join(repository, link)):
-    return
-  link_dir = os.path.dirname(os.path.join(new_workdir, link))
-  if not os.path.exists(link_dir):
-    os.makedirs(link_dir)
-  os.symlink(os.path.join(repository, link), os.path.join(new_workdir, link))
+      print('Creating: %s' % workdir)
+      git_common.make_workdir(os.path.join(root, '.git'),
+                              os.path.join(workdir, '.git'))
+      subprocess.check_call(['git', 'checkout', '-f'], cwd=workdir)
 
 
 if __name__ == '__main__':

data/vendor/depot_tools/gclient.bat

@@ -8,7 +8,7 @@ setlocal
 PATH=%~dp0;%PATH%
 
 :: Synchronize the root directory before deferring control back to gclient.py.
-call "%~dp0\update_depot_tools.bat" %*
+call "%~dp0update_depot_tools.bat" %*
 
 :: Defer control.
-%~dp0python "%~dp0\gclient.py" %*
+"%~dp0python" "%~dp0gclient.py" %*

data/vendor/depot_tools/gclient.py

@@ -76,6 +76,8 @@
 #     target_os = [ "ios" ]
 #     target_os_only = True
 
+from __future__ import print_function
+
 __version__ = '0.7'
 
 import ast
@@ -93,8 +95,6 @@ import time
 import urllib
 import urlparse
 
-import breakpad  # pylint: disable=W0611
-
 import fix_encoding
 import gclient_scm
 import gclient_utils
@@ -102,7 +102,7 @@ import git_cache
 from third_party.repo.progress import Progress
 import subcommand
 import subprocess2
-from third_party import colorama
+import setup_color
 
 CHROMIUM_SRC_URL = 'https://chromium.googlesource.com/chromium/src.git'
 
@@ -244,7 +244,7 @@ class DependencySettings(GClientKeywords):
     if (self._custom_vars.get('webkit_trunk', '') ==
         'svn://svn-mirror.golo.chromium.org/webkit-readonly/trunk'):
       new_url = 'svn://svn-mirror.golo.chromium.org/blink/trunk'
-      print 'Overwriting Var("webkit_trunk") with %s' % new_url
+      print('Overwriting Var("webkit_trunk") with %s' % new_url)
       self._custom_vars['webkit_trunk'] = new_url
 
     # Post process the url to remove trailing slashes.
@@ -636,7 +636,7 @@ class Dependency(gclient_utils.WorkItem, DependencySettings):
       # Eval the content.
       try:
         exec(deps_content, global_scope, local_scope)
-      except SyntaxError, e:
+      except SyntaxError as e:
         gclient_utils.SyntaxErrorToError(filepath, e)
       if use_strict:
         for key, val in local_scope.iteritems():
@@ -709,7 +709,7 @@ class Dependency(gclient_utils.WorkItem, DependencySettings):
     for name, url in deps.iteritems():
       should_process = self.recursion_limit and self.should_process
       deps_to_add.append(Dependency(
-          self, name, url, None, None, None, None, None,
+          self, name, url, None, None, None, self.custom_vars, None,
           self.deps_file, should_process))
     deps_to_add.sort(key=lambda x: x.name)
 
@@ -884,24 +884,24 @@ class Dependency(gclient_utils.WorkItem, DependencySettings):
 
               match = re.match('^Binary file ([^\0]+) matches$', line)
               if match:
-                print 'Binary file %s matches\n' % mod_path(match.group(1))
+                print('Binary file %s matches\n' % mod_path(match.group(1)))
                 return
 
               items = line.split('\0')
               if len(items) == 2 and items[1]:
-                print '%s : %s' % (mod_path(items[0]), items[1])
+                print('%s : %s' % (mod_path(items[0]), items[1]))
               elif len(items) >= 2:
                 # Multiple null bytes or a single trailing null byte indicate
                 # git is likely displaying filenames only (such as with -l)
-                print '\n'.join(mod_path(path) for path in items if path)
+                print('\n'.join(mod_path(path) for path in items if path))
               else:
-                print line
+                print(line)
           else:
             print_stdout = True
             filter_fn = None
 
           if parsed_url is None:
-            print >> sys.stderr, 'Skipped omitted dependency %s' % cwd
+            print('Skipped omitted dependency %s' % cwd, file=sys.stderr)
           elif os.path.isdir(cwd):
             try:
               gclient_utils.CheckCallAndFilter(
@@ -912,7 +912,7 @@ class Dependency(gclient_utils.WorkItem, DependencySettings):
               if not options.ignore:
                 raise
           else:
-            print >> sys.stderr, 'Skipped missing %s' % cwd
+            print('Skipped missing %s' % cwd, file=sys.stderr)
 
 
   @gclient_utils.lockedmethod
@@ -981,17 +981,17 @@ class Dependency(gclient_utils.WorkItem, DependencySettings):
         start_time = time.time()
         gclient_utils.CheckCallAndFilterAndHeader(
             hook, cwd=self.root.root_dir, always=True)
-      except (gclient_utils.Error, subprocess2.CalledProcessError), e:
+      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
         # differently from VC failures.
-        print >> sys.stderr, 'Error: %s' % str(e)
+        print('Error: %s' % str(e), file=sys.stderr)
         sys.exit(2)
       finally:
         elapsed_time = time.time() - start_time
         if elapsed_time > 10:
-          print "Hook '%s' took %.2f secs" % (
-              gclient_utils.CommandToStr(hook), elapsed_time)
+          print("Hook '%s' took %.2f secs" % (
+              gclient_utils.CommandToStr(hook), elapsed_time))
 
   def RunPreDepsHooks(self):
     assert self.processed
@@ -1006,17 +1006,17 @@ class Dependency(gclient_utils.WorkItem, DependencySettings):
         start_time = time.time()
         gclient_utils.CheckCallAndFilterAndHeader(
             hook, cwd=self.root.root_dir, always=True)
-      except (gclient_utils.Error, subprocess2.CalledProcessError), e:
+      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
         # differently from VC failures.
-        print >> sys.stderr, 'Error: %s' % str(e)
+        print('Error: %s' % str(e), file=sys.stderr)
         sys.exit(2)
       finally:
         elapsed_time = time.time() - start_time
         if elapsed_time > 10:
-          print "Hook '%s' took %.2f secs" % (
-              gclient_utils.CommandToStr(hook), elapsed_time)
+          print("Hook '%s' took %.2f secs" % (
+              gclient_utils.CommandToStr(hook), elapsed_time))
 
 
   def subtree(self, include_all):
@@ -1246,7 +1246,7 @@ want to set 'managed': False in .gclient.
     self.config_content = content
     try:
       exec(content, config_dict)
-    except SyntaxError, e:
+    except SyntaxError as e:
       gclient_utils.SyntaxErrorToError('.gclient', e)
 
     # Append any target OS that is not already being enforced to the tuple.
@@ -1378,6 +1378,9 @@ been automagically updated.  The previous version is available at %s.old.
       client = GClient('.', options)
       client.SetConfig(options.spec)
     else:
+      if options.verbose:
+        print('Looking for %s starting from %s\n' % (
+            options.config_filename, os.getcwd()))
       path = gclient_utils.FindGclientRoot(os.getcwd(), options.config_filename)
       if not path:
         return None
@@ -1389,13 +1392,14 @@ been automagically updated.  The previous version is available at %s.old.
     if (options.revisions and
         len(client.dependencies) > 1 and
         any('@' not in r for r in options.revisions)):
-      print >> sys.stderr, (
-          'You must specify the full solution name like --revision %s@%s\n'
-          'when you have multiple solutions setup in your .gclient file.\n'
-          'Other solutions present are: %s.') % (
+      print(
+          ('You must specify the full solution name like --revision %s@%s\n'
+           'when you have multiple solutions setup in your .gclient file.\n'
+           'Other solutions present are: %s.') % (
               client.dependencies[0].name,
               options.revisions[0],
-              ', '.join(s.name for s in client.dependencies[1:]))
+              ', '.join(s.name for s in client.dependencies[1:])),
+          file=sys.stderr)
     return client
 
   def SetDefaultConfig(self, solution_name, deps_file, solution_url,
@@ -1440,7 +1444,7 @@ been automagically updated.  The previous version is available at %s.old.
       return {}
     try:
       exec(gclient_utils.FileRead(filename), scope)
-    except SyntaxError, e:
+    except SyntaxError as e:
       gclient_utils.SyntaxErrorToError(filename, e)
     return scope['entries']
 
@@ -1507,7 +1511,7 @@ been automagically updated.  The previous version is available at %s.old.
       revision_overrides = self._EnforceRevisions()
     pm = None
     # Disable progress for non-tty stdout.
-    if (sys.stdout.isatty() and not self._options.verbose and progress):
+    if (setup_color.IS_TTY and not self._options.verbose and progress):
       if command in ('update', 'revert'):
         pm = Progress('Syncing projects', 1)
       elif command == 'recurse':
@@ -1519,8 +1523,8 @@ been automagically updated.  The previous version is available at %s.old.
       work_queue.enqueue(s)
     work_queue.flush(revision_overrides, command, args, options=self._options)
     if revision_overrides:
-      print >> sys.stderr, ('Please fix your script, having invalid '
-                            '--revision flags will soon considered an error.')
+      print('Please fix your script, having invalid --revision flags will soon '
+            'considered an error.', file=sys.stderr)
 
     # Once all the dependencies have been processed, it's now safe to run the
     # hooks.
@@ -1695,6 +1699,12 @@ been automagically updated.  The previous version is available at %s.old.
     """No DEPS to parse for a .gclient file."""
     raise gclient_utils.Error('Internal error')
 
+  def PrintLocationAndContents(self):
+    # Print out the .gclient file.  This is longer than if we just printed the
+    # client dict, but more legible, and it might contain helpful comments.
+    print('Loaded .gclient config in %s:\n%s' % (
+        self.root_dir, self.config_content))
+
   @property
   def root_dir(self):
     """Root directory of gclient checkout."""
@@ -1737,9 +1747,7 @@ def CMDcleanup(parser, args):
   if not client:
     raise gclient_utils.Error('client not configured; see \'gclient config\'')
   if options.verbose:
-    # Print out the .gclient file.  This is longer than if we just printed the
-    # client dict, but more legible, and it might contain helpful comments.
-    print(client.config_content)
+    client.PrintLocationAndContents()
   return client.RunOnDeps('cleanup', args)
 
 
@@ -1763,13 +1771,14 @@ def CMDrecurse(parser, args):
                     help='Disable progress bar that shows sub-command updates')
   options, args = parser.parse_args(args)
   if not args:
-    print >> sys.stderr, 'Need to supply a command!'
+    print('Need to supply a command!', file=sys.stderr)
     return 1
   root_and_entries = gclient_utils.GetGClientRootAndEntries()
   if not root_and_entries:
-    print >> sys.stderr, (
+    print(
         'You need to run gclient sync at least once to use \'recurse\'.\n'
-        'This is because .gclient_entries needs to exist and be up to date.')
+        'This is because .gclient_entries needs to exist and be up to date.',
+        file=sys.stderr)
     return 1
 
   # Normalize options.scm to a set()
@@ -1803,13 +1812,13 @@ def CMDgrep(parser, args):
   # We can't use optparse because it will try to parse arguments sent
   # to git grep and throw an error. :-(
   if not args or re.match('(-h|--help)$', args[0]):
-    print >> sys.stderr, (
+    print(
         'Usage: gclient grep [-j <N>] git-grep-args...\n\n'
         'Example: "gclient grep -j10 -A2 RefCountedBase" runs\n"git grep '
         '-A2 RefCountedBase" on each of gclient\'s git\nrepos with up to '
         '10 jobs.\n\nBonus: page output by appending "|& less -FRSX" to the'
-        ' end of your query.'
-        )
+        ' end of your query.',
+        file=sys.stderr)
     return 1
 
   jobs_arg = ['--jobs=1']
@@ -1886,6 +1895,12 @@ def CMDconfig(parser, args):
     else:
       # specify an alternate relpath for the given URL.
       name = options.name
+      if not os.path.abspath(os.path.join(os.getcwd(), name)).startswith(
+          os.getcwd()):
+        parser.error('Do not pass a relative path for --name.')
+      if any(x in ('..', '.', '/', '\\') for x in name.split(os.sep)):
+        parser.error('Do not include relative path components in --name.')
+
     deps_file = options.deps_file
     safesync_url = ''
     if len(args) > 1:
@@ -1921,9 +1936,7 @@ def CMDpack(parser, args):
   if not client:
     raise gclient_utils.Error('client not configured; see \'gclient config\'')
   if options.verbose:
-    # Print out the .gclient file.  This is longer than if we just printed the
-    # client dict, but more legible, and it might contain helpful comments.
-    print(client.config_content)
+    client.PrintLocationAndContents()
   return client.RunOnDeps('pack', args)
 
 
@@ -1938,9 +1951,7 @@ def CMDstatus(parser, args):
   if not client:
     raise gclient_utils.Error('client not configured; see \'gclient config\'')
   if options.verbose:
-    # Print out the .gclient file.  This is longer than if we just printed the
-    # client dict, but more legible, and it might contain helpful comments.
-    print(client.config_content)
+    client.PrintLocationAndContents()
   return client.RunOnDeps('status', args)
 
 
@@ -2039,6 +2050,14 @@ def CMDsync(parser, args):
                     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('--lock_timeout', type='int', default=5000,
+                    help='GIT ONLY - Deadline (in seconds) to wait for git '
+                         'cache lock to become available. Default is %default.')
   (options, args) = parser.parse_args(args)
   client = GClient.LoadCurrentConfig(options)
 
@@ -2050,9 +2069,7 @@ def CMDsync(parser, args):
     print('Warning: you cannot use both --head and --revision')
 
   if options.verbose:
-    # Print out the .gclient file.  This is longer than if we just printed the
-    # client dict, but more legible, and it might contain helpful comments.
-    print(client.config_content)
+    client.PrintLocationAndContents()
   ret = client.RunOnDeps('update', args)
   if options.output_json:
     slns = {}
@@ -2082,9 +2099,7 @@ def CMDdiff(parser, args):
   if not client:
     raise gclient_utils.Error('client not configured; see \'gclient config\'')
   if options.verbose:
-    # Print out the .gclient file.  This is longer than if we just printed the
-    # client dict, but more legible, and it might contain helpful comments.
-    print(client.config_content)
+    client.PrintLocationAndContents()
   return client.RunOnDeps('diff', args)
 
 
@@ -2103,6 +2118,11 @@ 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).')
   (options, args) = parser.parse_args(args)
   # --force is implied.
   options.force = True
@@ -2127,9 +2147,7 @@ def CMDrunhooks(parser, args):
   if not client:
     raise gclient_utils.Error('client not configured; see \'gclient config\'')
   if options.verbose:
-    # Print out the .gclient file.  This is longer than if we just printed the
-    # client dict, but more legible, and it might contain helpful comments.
-    print(client.config_content)
+    client.PrintLocationAndContents()
   options.force = True
   options.nohooks = False
   return client.RunOnDeps('runhooks', args)
@@ -2171,7 +2189,7 @@ def CMDhookinfo(parser, args):
   if not client:
     raise gclient_utils.Error('client not configured; see \'gclient config\'')
   client.RunOnDeps(None, [])
-  print '; '.join(' '.join(hook) for hook in client.GetHooks(options))
+  print('; '.join(' '.join(hook) for hook in client.GetHooks(options)))
   return 0
 
 
@@ -2187,10 +2205,10 @@ def CMDverify(parser, args):
     bad_deps = dep.findDepsFromNotAllowedHosts()
     if not bad_deps:
       continue
-    print "There are deps from not allowed hosts in file %s" % dep.deps_file
+    print("There are deps from not allowed hosts in file %s" % dep.deps_file)
     for bad_dep in bad_deps:
-      print "\t%s at %s" % (bad_dep.name, bad_dep.url)
-    print "allowed_hosts:", ', '.join(dep.allowed_hosts)
+      print("\t%s at %s" % (bad_dep.name, bad_dep.url))
+    print("allowed_hosts:", ', '.join(dep.allowed_hosts))
     sys.stdout.flush()
     raise gclient_utils.Error(
         'dependencies from disallowed hosts; check your DEPS file.')
@@ -2283,25 +2301,27 @@ def main(argv):
   """Doesn't parse the arguments here, just find the right subcommand to
   execute."""
   if sys.hexversion < 0x02060000:
-    print >> sys.stderr, (
+    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
   if not sys.executable:
-    print >> sys.stderr, (
-        '\nPython cannot find the location of it\'s own executable.\n')
+    print(
+        '\nPython cannot find the location of it\'s own executable.\n',
+        file=sys.stderr)
     return 2
   fix_encoding.fix_encoding()
   disable_buffering()
-  colorama.init()
+  setup_color.init()
   dispatcher = subcommand.CommandDispatcher(__name__)
   try:
     return dispatcher.execute(OptionParser(), argv)
   except KeyboardInterrupt:
     gclient_utils.GClientChildren.KillAllRemainingChildren()
     raise
-  except (gclient_utils.Error, subprocess2.CalledProcessError), e:
-    print >> sys.stderr, 'Error: %s' % str(e)
+  except (gclient_utils.Error, subprocess2.CalledProcessError) as e:
+    print('Error: %s' % str(e), file=sys.stderr)
     return 1
   finally:
     gclient_utils.PrintWarnings()