From: Ben Steffen <bds@mit.edu>
Date: Tue, 26 Nov 2019 19:22:34 +0000 (-0500)
Subject: Remove captureOutput (use subprocess.run instead)
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-base.git/commitdiff_plain/4b2c5c02af53a143d27c94403a1ba557bc1005e9

Remove captureOutput (use subprocess.run instead)
---

diff --git a/python/invirt/common.py b/python/invirt/common.py
index ffd2e4c..effb237 100644
--- a/python/invirt/common.py
+++ b/python/invirt/common.py
@@ -20,29 +20,6 @@ def lock_file(path, exclusive = True):
         finally:
             flock(f, LOCK_UN)
 
-def captureOutput(popen_args, stdin_str=None, *args, **kwargs):
-    """Capture stdout from a command.
-
-    This method will proxy the arguments to subprocess.Popen. It
-    returns the output from the command if the call succeeded and
-    raises an exception if the process returns a non-0 value.
-
-    This is intended to be a variant on the subprocess.check_call
-    function that also allows you access to the output from the
-    command.
-    """
-    if 'stdin' not in kwargs:
-        kwargs['stdin'] = subprocess.PIPE
-    if 'stdout' not in kwargs:
-        kwargs['stdout'] = subprocess.PIPE
-    if 'stderr' not in kwargs:
-        kwargs['stderr'] = subprocess.PIPE
-    p = subprocess.Popen(popen_args, *args, **kwargs)
-    out, err = p.communicate(stdin_str)
-    if p.returncode:
-        raise subprocess.CalledProcessError(p.returncode, '%s, stdout: %s, stderr: %s' %
-                                            (popen_args, out, err))
-    return out
 
 #
 # Exceptions.