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, **kwargs):

[scottmg, 2015/01/23 21:09:41]

I think this is just subprocess.call() now?

[hinoka, 2015/01/23 21:56:25]

You're right.  Done.

I'm keeping the alias, because I like this pattern.  And subprocess.call() by
default sets all the stdio to None.

+  kwargs['stdout'] = sys.stdout
+  kwargs['stderr'] = sys.stderr
+  kwargs['stdin'] = sys.stdin
   proc = subprocess.Popen(args, **kwargs)
-  out = []
-  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)
+  return proc.wait()
 
 
 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)
 
   # Check if the target exists already.
   if os.path.exists(target_filename):
     md5_calc = hashlib.md5()
     with open(target_filename, 'rb') as f:
       while True:
         buf = f.read(4096)
         if not buf:
           break
         md5_calc.update(buf)
     local_md5 = md5_calc.hexdigest()
 
     metadata_url = '%s%s' % (API_URL, filename)
     metadata = json.load(urllib2.urlopen(metadata_url))
     remote_md5 = base64.b64decode(metadata['md5Hash'])
 
     if local_md5 == remote_md5:
       return target_filename
     os.remove(target_filename)
 
   # Do the download.
   url = '%s%s' % (GSUTIL_URL, filename)
   u = urllib2.urlopen(url)
+  print >> sys.stderr, 'Downloading gsutil from %s...' % url
   with open(target_filename, 'wb') as f:
     while True:
       buf = u.read(4096)
       if not buf:
         break
       f.write(buf)
   return target_filename
 
 
 def check_gsutil(gsutil_bin):
   """Run gsutil version and make sure it runs."""
-  try:
-    call([sys.executable, gsutil_bin, 'version'], verbose=False)
-    return True
-  except SubprocessError:
-    return False
+  return call([sys.executable, gsutil_bin, 'version']) == 0
 
 
 def ensure_gsutil(version, target):
   bin_dir = os.path.join(target, 'gsutil_%s' % version)
   gsutil_bin = os.path.join(bin_dir, 'gsutil', 'gsutil')
   if os.path.isfile(gsutil_bin) and check_gsutil(gsutil_bin):
     # Everything is awesome! we're all done here.
     return gsutil_bin
 
   if os.path.isdir(bin_dir):
@@ skipping 40 matching lines @@
     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())