From: Robin Gareus <robin@gareus.org>
Date: Sat, 22 Aug 2015 22:00:19 +0000 (+0200)
Subject: more python2/3 compat
X-Git-Tag: 4.3~605
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=0fd984595782bef22724b43d3c82bf0de67b82e1;p=ardour.git

more python2/3 compat
---

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: