Remove the class StdoutAnnotated and clones the object instead.

gclient.py

 #!/usr/bin/python
 # Copyright (c) 2010 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
@@ skipping 1152 matching lines @@
   parser.description = re.sub('[\r\n ]{2,}', ' ', obj.__doc__)
   usage = getattr(obj, 'usage', '')
   parser.set_usage('%%prog %s [options] %s' % (command, usage))
   parser.epilog = getattr(obj, 'epilog', None)
 
 
 def Main(argv):
   """Doesn't parse the arguments here, just find the right subcommand to
   execute."""
   try:
+    # Make stdout auto-flush so buildbot doesn't kill us during lengthy
+    # operations. Python as a strong tendency to buffer sys.stdout.
+    sys.stdout = gclient_utils.MakeFileAutoFlush(sys.stdout)
+
     # Do it late so all commands are listed.
     CMDhelp.usage = ('\n\nCommands are:\n' + '\n'.join([
         '  %-10s %s' % (fn[3:], Command(fn[3:]).__doc__.split('\n')[0].strip())
         for fn in dir(sys.modules[__name__]) if fn.startswith('CMD')]))
     parser = optparse.OptionParser(version='%prog ' + __version__)
     parser.add_option('-j', '--jobs', default=1, type='int',
                       help='Specify how many SCM commands can run in parallel; '
                            'default=%default')
     parser.add_option('-v', '--verbose', action='count', default=0,
                       help='Produces additional output for diagnostics. Can be '
                            'used up to three times for more logging info.')
     parser.add_option('--gclientfile', dest='config_filename',
                       default=os.environ.get('GCLIENT_FILE', '.gclient'),
                       help='Specify an alternate %default file')
     # Integrate standard options processing.
     old_parser = parser.parse_args
     def Parse(args):
       (options, args) = old_parser(args)
       level = None
       if options.verbose == 2:
         level = logging.INFO
       elif options.verbose > 2:
         level = logging.DEBUG
       logging.basicConfig(level=level,
           format='%(module)s(%(lineno)d) %(funcName)s:%(message)s')
       options.entries_filename = options.config_filename + '_entries'
       if options.jobs < 1:
         parser.error('--jobs must be 1 or higher')
-      # Always autoflush so buildbot doesn't kill us during lengthy operations.
-      options.stdout = gclient_utils.StdoutAutoFlush(sys.stdout)
+      # TODO(maruel): Temporary, to be removed.
+      options.stdout = sys.stdout
 
       # These hacks need to die.
       if not hasattr(options, 'revisions'):
         # GClient.RunOnDeps expects it even if not applicable.
         options.revisions = []
       if not hasattr(options, 'head'):
         options.head = None
       if not hasattr(options, 'nohooks'):
         options.nohooks = True
       if not hasattr(options, 'deps_os'):
@@ skipping 17 matching lines @@
     return CMDhelp(parser, argv)
   except gclient_utils.Error, e:
     print >> sys.stderr, 'Error: %s' % str(e)
     return 1
 
 
 if '__main__' == __name__:
   sys.exit(Main(sys.argv[1:]))
 
 # vim: ts=2:sw=2:tw=80:et: