From 86d421a802c03224e7e7b651a22d5231f5c9e1f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Wed, 6 Feb 2013 09:55:57 +0100 Subject: [PATCH] subprocess.check_output is only available on python 2.7 the testsuite machine has 2.6 --- Documentation/testsuite.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Documentation/testsuite.py b/Documentation/testsuite.py index be6f90cbe5f..c3cc07ffab4 100755 --- a/Documentation/testsuite.py +++ b/Documentation/testsuite.py @@ -71,8 +71,12 @@ def run_doxyassist(doxyassist, doxygen): subprocess.call([sys.executable,doxyassist, '--debug', '--doxygen', doxygen, 'doxyassist.xml']) def get_version(): - rev=subprocess.check_output(['git', 'rev-parse', 'HEAD'], universal_newlines=True) - date=subprocess.check_output(['git', 'log', '-n', '1', '--format=\"%ai\"', '--date=short'], universal_newlines=True) + proc=subprocess.Popen(['git', 'rev-parse', 'HEAD'], stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True) + rev,err=proc.communicate() + proc=subprocess.Popen(['git', 'log', '-n', '1', '--format=\"%ai\"', '--date=short'], stdout=subprocess.PIPE,stderr=subprocess.PIPE, universal_newlines=True) + date,err=proc.communicate() + #rev=subprocess.check_output(['git', 'rev-parse', 'HEAD'], universal_newlines=True) + #date=subprocess.check_output(['git', 'log', '-n', '1', '--format=\"%ai\"', '--date=short'], universal_newlines=True) date=date[1:11] return (rev, date)