From 093bdcafc9a2a2602f8da7da3a010958cbb7d155 Mon Sep 17 00:00:00 2001 From: Aleksey Filippov Date: Sun, 11 Mar 2018 23:24:34 +0000 Subject: [PATCH] Use subprocess.check_output() instead of Popen().communicate() --- test cases/common/72 build always/version_gen.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/test cases/common/72 build always/version_gen.py b/test cases/common/72 build always/version_gen.py index e5a0c2c64..17e613e1c 100755 --- a/test cases/common/72 build always/version_gen.py +++ b/test cases/common/72 build always/version_gen.py @@ -6,14 +6,10 @@ def generate(infile, outfile, fallback): workdir = os.path.split(infile)[0] if workdir == '': workdir = '.' - version = fallback try: - p = subprocess.Popen(['git', 'describe'], cwd=workdir, stdout=subprocess.PIPE, stderr=subprocess.PIPE) - (stdo, _) = p.communicate() - if p.returncode == 0: - version = stdo.decode().strip() + version = subprocess.check_output(['git', 'describe'], cwd=workdir).decode().strip() except Exception: - pass + version = fallback with open(infile) as f: newdata = f.read().replace('@VERSION@', version) try: