ref: 7abefed635b8dd83ecba1562a908ca150a904662
parent: 56d781aae94983a546feb30309a421a5d4a77b2d
parent: 3ed38e4439b8b291c362d5eef8c9a63666b2b87f
author: Paul Brossier <piem@piem.org>
date: Thu May 9 15:48:01 EDT 2019
Merge branch 'master' into feature/autosink
--- a/python/lib/gen_external.py
+++ b/python/lib/gen_external.py
@@ -120,23 +120,24 @@
print("Running command: {:s}".format(" ".join(cpp_cmd)))proc = subprocess.Popen(cpp_cmd,
stderr=subprocess.PIPE,
- stdout=subprocess.PIPE)
+ stdout=subprocess.PIPE,
+ universal_newlines=True)
assert proc, 'Proc was none'
cpp_output = proc.stdout.read()
err_output = proc.stderr.read()
if err_output:
print("Warning: preprocessor produced errors or warnings:\n%s" \- % err_output.decode('utf8'))+ % err_output)
if not cpp_output:
raise_msg = "preprocessor output is empty! Running command " \
+ "\"%s\" failed" % " ".join(cpp_cmd)
if err_output:
- raise_msg += " with stderr: \"%s\"" % err_output.decode('utf8')+ raise_msg += " with stderr: \"%s\"" % err_output
else:
raise_msg += " with no stdout or stderr"
raise Exception(raise_msg)
if not isinstance(cpp_output, list):
- cpp_output = [l.strip() for l in cpp_output.decode('utf8').split('\n')]+ cpp_output = [l.strip() for l in cpp_output.split('\n')]return cpp_output