1 files changed, 2 insertions, 52 deletions
diff --git a/buildscripts/eslint.py b/buildscripts/eslint.py
index 06562f2f8da..0bcf567dab0 100755
--- a/buildscripts/eslint.py
+++ b/buildscripts/eslint.py
@@ -59,60 +59,10 @@ ESLINT_SOURCE_TAR_BASE = string.Template(ESLINT_PROGNAME + "-$platform-$arch")
 # Has to match the string in SConstruct.
 MODULE_DIR = "src/mongo/db/modules"
 
-# Copied from python 2.7 version of subprocess.py
-# Exception classes used by this module.
-class CalledProcessError(Exception):
-    """This exception is raised when a process run by check_call() or
-    check_output() returns a non-zero exit status.
-    The exit status will be stored in the returncode attribute;
-    check_output() will also store the output in the output attribute.
-    """
-    def __init__(self, returncode, cmd, output=None):
-        self.returncode = returncode
-        self.cmd = cmd
-        self.output = output
-    def __str__(self):
-        return ("Command '%s' returned non-zero exit status %d with output %s" %
-            (self.cmd, self.returncode, self.output))
-
-
-# Copied from python 2.7 version of subprocess.py
-def check_output(*popenargs, **kwargs):
-    r"""Run command with arguments and return its output as a byte string.
-
-    If the exit code was non-zero it raises a CalledProcessError.  The
-    CalledProcessError object will have the return code in the returncode
-    attribute and output in the output attribute.
-
-    The arguments are the same as for the Popen constructor.  Example:
-
-    >>> check_output(["ls", "-l", "/dev/null"])
-    'crw-rw-rw- 1 root root 1, 3 Oct 18  2007 /dev/null\n'
-
-    The stdout argument is not allowed as it is used internally.
-    To capture standard error in the result, use stderr=STDOUT.
-
-    >>> check_output(["/bin/sh", "-c",
-    ...               "ls -l non_existent_file ; exit 0"],
-    ...              stderr=STDOUT)
-    'ls: non_existent_file: No such file or directory\n'
-    """
-    if 'stdout' in kwargs:
-        raise ValueError('stdout argument not allowed, it will be overridden.')
-    process = subprocess.Popen(stdout=subprocess.PIPE, *popenargs, **kwargs)
-    output, unused_err = process.communicate()
-    retcode = process.poll()
-    if retcode:
-        cmd = kwargs.get("args")
-        if cmd is None:
-            cmd = popenargs[0]
-        raise CalledProcessError(retcode, cmd, output)
-    return output
-
 def callo(args):
     """Call a program, and capture its output
     """
-    return check_output(args)
+    return subprocess.check_output(args)
 
 def extract_eslint(tar_path, target_file):
     tarfp = tarfile.open(tar_path)
@@ -223,7 +173,7 @@ class ESLint(object):
         # so only enter the printing logic if we have an error.
         try:
             eslint_output = callo([self.path, "-f", "unix", file_name])
-        except CalledProcessError as e:
+        except subprocess.CalledProcessError as e:
             if print_diff:
                 # Take a lock to ensure error messages do not get mixed when printed to the screen
                 with self.print_lock: