From a7293b92f41e201581a04c3bcc1d451038c269e2 Mon Sep 17 00:00:00 2001 From: Philip Sequeira Date: Fri, 13 Jun 2014 14:12:06 -0400 Subject: build: version string as native str type for each Python version Should resolve the "mpv b'...'" issue on Python 3 without breaking things on Python 2. Also, remove redundant wait for process. --- waftools/generators/headers.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/waftools/generators/headers.py b/waftools/generators/headers.py index 8c164cca73..b38fcb88f4 100644 --- a/waftools/generators/headers.py +++ b/waftools/generators/headers.py @@ -4,9 +4,11 @@ def __get_version__(ctx): stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=ctx.srcnode.abspath()) - process.wait() (version, err) = process.communicate() - return version.strip().decode('utf-8').encode('ascii', 'ignore') + version = version.strip() + if not isinstance(version, str): + version = version.decode('utf-8') + return version def __get_build_date__(): import time -- cgit v1.2.3