Make subprocess2.call() returned values to be the same as subprocess.call().

subprocess2.py

 # coding=utf8
 # Copyright (c) 2011 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.
 """Collection of subprocess wrapper functions.
 
 In theory you shouldn't need anything else in subprocess, or this module failed.
 """
 
 from __future__ import with_statement
@@ skipping 174 matching lines @@
           kwargs.get('cwd'),
           None,
           'Visit '
           'http://code.google.com/p/chromium/wiki/CygwinDllRemappingFailure to '
           'learn how to fix this error; you need to rebase your cygwin dlls')
     # Popen() can throw OSError when cwd or args[0] doesn't exist. Let it go
     # through
     raise
 
 
-def call(args, timeout=None, **kwargs):
+def communicate(args, timeout=None, **kwargs):
   """Wraps subprocess.Popen().communicate().
 
   Returns ((stdout, stderr), returncode).
 
   - The process will be killed after |timeout| seconds and returncode set to
     TIMED_OUT.
   - Automatically passes stdin content as input so do not specify stdin=PIPE.
   """
   stdin = kwargs.pop('stdin', None)
   if stdin is not None:
@@ skipping 27 matching lines @@
         proc.wait()
         # It's -9 on linux and 1 on Windows. Standardize to TIMED_OUT.
         proc.returncode = TIMED_OUT
       time.sleep(0.001)
     # Now that the process died, reset the cursor and read the file.
     buff.seek(0)
     out = [buff.read(), None]
   return out, proc.returncode
 
 
+def call(args, **kwargs):
+  """Emulates subprocess.call().
+
+  Automatically convert stdout=PIPE or stderr=PIPE to VOID.
+  """
+  if kwargs.get('stdout') == PIPE:
+    kwargs['stdout'] = VOID
+  if kwargs.get('stderr') == PIPE:
+    kwargs['stderr'] = VOID
+  return communicate(args, **kwargs)[1]
+
+
 def check_call(args, **kwargs):
   """Improved version of subprocess.check_call().
 
   Returns (stdout, stderr), unlike subprocess.check_call().
   """
-  out, returncode = call(args, **kwargs)
+  out, returncode = communicate(args, **kwargs)
   if returncode:
     raise CalledProcessError(
         returncode, args, kwargs.get('cwd'), out[0], out[1])
   return out
 
 
 def capture(args, **kwargs):
   """Captures stdout of a process call and returns it.
 
   Returns stdout.
 
   - Discards returncode.
   - Discards stderr. By default sets stderr=STDOUT.
   - Blocks stdin by default since no output will be visible.
   """
   if kwargs.get('stdin') is None:
     kwargs['stdin'] = VOID
   if kwargs.get('stdout') is None:
     kwargs['stdout'] = PIPE
   if kwargs.get('stderr') is None:
     kwargs['stderr'] = STDOUT
-  return call(args, **kwargs)[0][0]
+  return communicate(args, **kwargs)[0][0]
 
 
 def check_output(args, **kwargs):
   """Captures stdout of a process call and returns it.
 
   Returns stdout.
 
   - Discards stderr. By default sets stderr=STDOUT.
   - Throws if return code is not 0.
   - Works even prior to python 2.7.
   - Blocks stdin by default since no output will be visible.
   """
   if kwargs.get('stdin') is None:
     kwargs['stdin'] = VOID
   if kwargs.get('stdout') is None:
     kwargs['stdout'] = PIPE
   if kwargs.get('stderr') is None:
     kwargs['stderr'] = STDOUT
   return check_call(args, **kwargs)[0]