subprocess.check_output is only available on python 2.7

the testsuite machine has 2.6
This commit is contained in:
Sébastien Loriot 2013-02-06 09:55:57 +01:00
parent 3dfac001c0
commit 86d421a802
1 changed files with 6 additions and 2 deletions

View File

@ -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)