summaryrefslogtreecommitdiffstats
path: root/build/mixxx.py
diff options
context:
space:
mode:
authorOlaf Hering <olaf@aepfle.de>2017-12-19 09:11:32 +0100
committerOlaf Hering <olaf@aepfle.de>2017-12-19 09:12:24 +0100
commitb2df4fb8a01939e16dde289503e0ba166c20ccdd (patch)
tree3a2c4f8a45ce1d1f6a26e29da37547e038e92b80 /build/mixxx.py
parentebc2eed9849ee4ac30f296873740821d9f0bf46b (diff)
build: convert default_qtdir from bytes into string
Python3 is picky about byte vs. str variables. From their docs: ... communicate() returns a tuple (stdout_data, stderr_data). The data will be strings if streams were opened in text mode; otherwise, bytes. ... The value returned by Popen() is 'bytes', it is later used together with 'str'. Python3 rejects a mixture of 'byte' and 'str'. Change the value of default_qtdir to type 'str'. Signed-off-by: Olaf Hering <olaf@aepfle.de>
Diffstat (limited to 'build/mixxx.py')
-rw-r--r--build/mixxx.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/build/mixxx.py b/build/mixxx.py
index 2664f7bb37..b6662896cd 100644
--- a/build/mixxx.py
+++ b/build/mixxx.py
@@ -164,7 +164,7 @@ class MixxxBuild(object):
if any(os.access(os.path.join(path, 'pkg-config'), os.X_OK) for path in os.environ["PATH"].split(os.pathsep)):
import subprocess
try:
- default_qtdir = subprocess.Popen(["pkg-config", "--variable=includedir", "Qt5Core"], stdout = subprocess.PIPE).communicate()[0].rstrip()
+ default_qtdir = subprocess.Popen(["pkg-config", "--variable=includedir", "Qt5Core"], stdout = subprocess.PIPE).communicate()[0].rstrip().decode()
finally:
pass