From 7ca96b371e71adf565941c17b3d807e7dead734e Mon Sep 17 00:00:00 2001 From: Mark Benvenuto Date: Thu, 9 Mar 2017 13:47:54 -0500 Subject: SERVER-27462 Remove Python 2.6 compatibility code from scripts in buildscripts/ directory --- buildscripts/hang_analyzer.py | 37 +------------------------------------ 1 file changed, 1 insertion(+), 36 deletions(-) (limited to 'buildscripts/hang_analyzer.py') diff --git a/buildscripts/hang_analyzer.py b/buildscripts/hang_analyzer.py index 6be459ae750..da000998711 100755 --- a/buildscripts/hang_analyzer.py +++ b/buildscripts/hang_analyzer.py @@ -49,45 +49,10 @@ def call(a, logger): raise Exception() -# 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=output) - - return output - - def callo(a, logger): logger.info("%s" % str(a)) - return check_output(a) + return subprocess.check_output(a) def find_program(prog, paths): -- cgit v1.2.1