Fix coloring madness in depot_tools.

gclient.py

 #!/usr/bin/env python
 # 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.
 
 """Meta checkout manager supporting both Subversion and GIT."""
 # Files
 #   .gclient      : Current client configuration, written by 'config' command.
 #                   Format is a Python script defining 'solutions', a list whose
 #                   entries each are maps binding the strings "name" and "url"
@@ skipping 84 matching lines @@
 import urllib
 import urlparse
 
 import fix_encoding
 import gclient_scm
 import gclient_utils
 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'
 
 
 def ast_dict_index(dnode, key):
   """Search an ast.Dict for the argument key, and return its index."""
   idx = [i for i in range(len(dnode.keys)) if (
       type(dnode.keys[i]) is ast.Str and dnode.keys[i].s == key)]
   if not idx:
     return -1
@@ skipping 1388 matching lines @@
       raise gclient_utils.Error('No solution specified')
 
     revision_overrides = {}
     # It's unnecessary to check for revision overrides for 'recurse'.
     # Save a few seconds by not calling _EnforceRevisions() in that case.
     if command not in ('diff', 'recurse', 'runhooks', 'status', 'revert'):
       self._CheckConfig()
       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':
         pm = Progress(' '.join(args), 1)
     work_queue = gclient_utils.ExecutionQueue(
         self._options.jobs, pm, ignore_requirements=ignore_requirements,
         verbose=self._options.verbose)
     for s in self.dependencies:
       work_queue.enqueue(s)
     work_queue.flush(revision_overrides, command, args, options=self._options)
@@ skipping 771 matching lines @@
         sys.version.split(' ', 1)[0],
         file=sys.stderr)
     return 2
   if not sys.executable:
     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(wrap="TERM" not in os.environ)
+  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) as e:
     print('Error: %s' % str(e), file=sys.stderr)
     return 1
   finally:
     gclient_utils.PrintWarnings()
   return 0
 
 
 if '__main__' == __name__:
   try:
     sys.exit(main(sys.argv[1:]))
   except KeyboardInterrupt:
     sys.stderr.write('interrupted\n')
     sys.exit(1)
 
 # vim: ts=2:sw=2:tw=80:et: