Explicitly print diff stats to sys.stdout, if possible.

git_cl.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.
 
 # Copyright (C) 2008 Evan Martin <martine@danga.com>
 
 """A git-command for integrating reviews on Rietveld."""
 
 import datetime
@@ skipping 241 matching lines @@
   env = GetNoGitPagerEnv()
   if 'GIT_EXTERNAL_DIFF' in env:
     del env['GIT_EXTERNAL_DIFF']
 
   if find_copies:
     similarity_options = ['--find-copies-harder', '-l100000',
                           '-C%s' % similarity]
   else:
     similarity_options = ['-M%s' % similarity]
 
+  try:
+    stdout = sys.stdout.fileno()

[Dirk Pranke, 2014/05/29 20:31:36]

drive-by nit: sys.stdout works fine, you don't need the fileno() ...

[szager1, 2014/05/29 20:48:04]

There is some existing code that replaces sys.stdout with a StringIO, and that
won't work, because there's no file descriptor associated with a StringIO.  So,
to do what you say, I'd have to:

try:
  sys.stdout.fileno()
  stdout = sys.stdout
except AttributeError:
  stdout = None

... which seems silly to me.

[Dirk Pranke, 2014/05/29 21:10:47]

You lost me, or maybe I'm not understanding something. subprocess2.call() should
be just fine w/ receiving a file-like object for the stdout= keyword parameter,
and so passing a StringIO should be fine as well. 

+  except AttributeError:
+    stdout = None
   return subprocess2.call(
       ['git',
        'diff', '--no-ext-diff', '--stat'] + similarity_options + args,
-      env=env)
+      stdout=stdout, env=env)
 
 
 class Settings(object):
   def __init__(self):
     self.default_server = None
     self.cc = None
     self.root = None
     self.is_git_svn = None
     self.svn_branch = None
     self.tree_status_url = None
@@ skipping 2324 matching lines @@
         ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
           'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
 
 
 if __name__ == '__main__':
   # These affect sys.stdout so do it outside of main() to simplify mocks in
   # unit testing.
   fix_encoding.fix_encoding()
   colorama.init()
   sys.exit(main(sys.argv[1:]))