From: Paul Brossier <piem@piem.org>
Date: Wed, 8 May 2019 17:37:51 +0000 (+0200)
Subject: Merge branch 'fix/winencoding' (closes gh-247)
X-Git-Url: https://git.aubio.org/?p=aubio.git;a=commitdiff_plain;h=3ed38e4439b8b291c362d5eef8c9a63666b2b87f;hp=f55630c5e9397c94d3f0e683c6eeb2c89fd6d490

Merge branch 'fix/winencoding' (closes gh-247)
---

diff --git a/python/lib/gen_external.py b/python/lib/gen_external.py
index 1425c9b8..e5f0a02d 100644
--- a/python/lib/gen_external.py
+++ b/python/lib/gen_external.py
@@ -120,23 +120,24 @@ def get_cpp_output(header=header, usedouble=False):
     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