Hook sys.stdio directly to the gsutil subprocess for the gsutil call

gsutil.py

 #!/usr/bin/env python
 # Copyright 2014 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.
 
 """Run a pinned gsutil."""
 
 
 import argparse
 import base64
@@ skipping 19 matching lines @@
 class SubprocessError(Exception):
   def __init__(self, message=None, code=0):
     super(SubprocessError, self).__init__(message)
     self.code = code
 
 
 class InvalidGsutilError(Exception):
   pass
 
 
-def call(args, verbose=True, **kwargs):
-  kwargs['stdout'] = subprocess.PIPE
-  kwargs['stderr'] = subprocess.STDOUT
+def call(args, verbose=True, native=False, **kwargs):
+  if native:
+    kwargs['stdout'] = sys.stdout
+    kwargs['stderr'] = sys.stderr
+  else:
+    kwargs['stdout'] = subprocess.PIPE
+    kwargs['stderr'] = subprocess.STDOUT
+  kwargs['stdin'] = sys.stdin
   proc = subprocess.Popen(args, **kwargs)
   out = []
-  for line in proc.stdout:
-    out.append(line)
-    if verbose:
-      sys.stdout.write(line)
+  if not native:
+    for line in proc.stdout:
+      out.append(line)
+      if verbose:
+        sys.stdout.write(line)
   code = proc.wait()
   if code:
     raise SubprocessError('%s failed with %s' % (args, code), code)
   return ''.join(out)
 
 
 def download_gsutil(version, target_dir):
   """Downloads gsutil into the target_dir."""
   filename = 'gsutil_%s.zip' % version
   target_filename = os.path.join(target_dir, filename)
@@ skipping 62 matching lines @@
   return gsutil_bin
 
 
 def run_gsutil(force_version, fallback, target, args):
   if force_version:
     gsutil_bin = ensure_gsutil(force_version, target)
   else:
     gsutil_bin = fallback
   cmd = [sys.executable, gsutil_bin] + args
   try:
-    call(cmd)
+    call(cmd, native=True)

[scottmg, 2015/01/23 20:51:54]

The only other place it's used is check_gsutil, so probably just get rid of the
arg and make it always equivalent to native=True?

[hinoka, 2015/01/23 21:05:35]

Done.

   except SubprocessError as e:
     return e.code
   return 0
 
 
 def parse_args():
   parser = argparse.ArgumentParser()
   parser.add_argument('--force-version')
   parser.add_argument('--fallback', default=DEFAULT_FALLBACK_GSUTIL)
   parser.add_argument('--target', default=DEFAULT_BIN_DIR)
   parser.add_argument('args', nargs=argparse.REMAINDER)
 
   args, extras = parser.parse_known_args()
   if args.args and args.args[0] == '--':
     args.args.pop(0)
   if extras:
     args.args = extras + args.args
   return args.force_version, args.fallback, args.target, args.args
 
 
 def main():
   force_version, fallback, target, args = parse_args()
   return run_gsutil(force_version, fallback, target, args)
 
 if __name__ == '__main__':
   sys.exit(main())