From 0fd984595782bef22724b43d3c82bf0de67b82e1 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sun, 23 Aug 2015 00:00:19 +0200 Subject: [PATCH] more python2/3 compat --- wscript | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/wscript b/wscript index 38a61a7652..3e39d76b3c 100644 --- a/wscript +++ b/wscript @@ -183,13 +183,8 @@ V = MAJOR + '.' + MINOR + '.' + MICRO # can cause odd problems elsewhere. Note that # in python3, encode and decode do not return # strings, so we have to force the type. -VERSION = str (V.encode ('ascii', 'ignore')) -PROGRAM_VERSION = str (MAJOR.encode ('ascii', 'ignore')) - -# It seems, that on msys2, with python3, it puts quotes around -# the version number, which breaks the build. -VERSION = VERSION.replace('\'', '') -PROGRAM_VERSION = PROGRAM_VERSION.replace('\'', '') +VERSION = V.encode ('ascii', 'ignore').decode ("utf-8") +PROGRAM_VERSION = MAJOR.encode ('ascii', 'ignore').decode ("utf-8") if len (sys.argv) > 1 and sys.argv[1] == 'dist': if not 'APPNAME' in os.environ: -- 2.30.2