Add stdout param to SubprocessCallAndFilter().

gclient_utils.py

 # Copyright 2009 Google Inc.  All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 248 matching lines @@
   description.
   """
   # Call subprocess and capture nothing:
   SubprocessCallAndFilter(command, in_directory, True, True, fail_status)
 
 
 def SubprocessCallAndFilter(command,
                             in_directory,
                             print_messages,
                             print_stdout,
-                            fail_status=None, filter_fn=None):
+                            fail_status=None,
+                            filter_fn=None,
+                            stdout=None):
   """Runs command, a list, in directory in_directory.
 
   If print_messages is true, a message indicating what is being done
   is printed to stdout. If print_messages is false, the message is printed
   only if we actually need to print something else as well, so you can
   get the context of the output. If print_messages is false and print_stdout
   is false, no output at all is generated.
 
   Also, if print_stdout is true, the command's stdout is also forwarded
   to stdout.
 
   If a filter_fn function is specified, it is expected to take a single
   string argument, and it will be called with each line of the
   subprocess's output. Each line has had the trailing newline character
   trimmed.
 
   If the command fails, as indicated by a nonzero exit status, gclient will
   exit with an exit status of fail_status.  If fail_status is None (the
   default), gclient will raise an Error exception.
   """
+  stdout = stdout or sys.stdout
   logging.debug(command)
   if print_messages:
-    print('\n________ running \'%s\' in \'%s\''
+    stdout.write('\n________ running \'%s\' in \'%s\'\n'
           % (' '.join(command), in_directory))
 
   kid = Popen(command, bufsize=0, cwd=in_directory,
               stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
 
   # Do a flush of sys.stdout before we begin reading from the subprocess's
   # stdout.
   last_flushed_at = time.time()
-  sys.stdout.flush()
+  stdout.flush()
 
   # Also, we need to forward stdout to prevent weird re-ordering of output.
   # This has to be done on a per byte basis to make sure it is not buffered:
   # normally buffering is done for each line, but if svn requests input, no
   # end-of-line character is output after the prompt and it would not show up.
   in_byte = kid.stdout.read(1)
   in_line = ''
   while in_byte:
     if in_byte != '\r':
       if print_stdout:
         if not print_messages:
-          print('\n________ running \'%s\' in \'%s\''
+          stdout.write('\n________ running \'%s\' in \'%s\'\n'
               % (' '.join(command), in_directory))
           print_messages = True
-        sys.stdout.write(in_byte)
+        stdout.write(in_byte)
       if in_byte != '\n':
         in_line += in_byte
     if in_byte == '\n':
       if filter_fn:
         filter_fn(in_line)
       in_line = ''
       # Flush at least 10 seconds between line writes.  We wait at least 10
       # seconds to avoid overloading the reader that called us with output,
       # which can slow busy readers down.
       if (time.time() - last_flushed_at) > 10:
         last_flushed_at = time.time()
-        sys.stdout.flush()
+        stdout.flush()
     in_byte = kid.stdout.read(1)
   # Flush the rest of buffered output. This is only an issue with files not
   # ending with a \n.
   if len(in_line) and filter_fn:
     filter_fn(in_line)
   rv = kid.wait()
 
   if rv:
     msg = 'failed to run command: %s' % ' '.join(command)
-
     if fail_status != None:
-      print >> sys.stderr, msg
+      sys.stderr.write(msg + '\n')
       sys.exit(fail_status)
-
     raise Error(msg)
 
 
 def FindGclientRoot(from_dir, filename='.gclient'):
   """Tries to find the gclient root."""
   path = os.path.realpath(from_dir)
   while not os.path.exists(os.path.join(path, filename)):
     split_path = os.path.split(path)
     if not split_path[1]:
       return None
@@ skipping 181 matching lines @@
         if exception:
           self.parent.exceptions.append(exception)
         if self.parent.progress:
           self.parent.progress.update(1)
         assert not self.item.name in self.parent.ran
         if not self.item.name in self.parent.ran:
           self.parent.ran.append(self.item.name)
       finally:
         self.parent.ready_cond.notifyAll()
         self.parent.ready_cond.release()