diff options
author | Robin Gareus <robin@gareus.org> | 2015-08-23 00:00:19 +0200 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2015-08-23 00:00:19 +0200 |
commit | 0fd984595782bef22724b43d3c82bf0de67b82e1 (patch) | |
tree | 5c34cacac5356e96aeb51a6c9b037a42e1bdf5a0 /wscript | |
parent | ea0e4a01ca0cd22a3efe596a5879dfc30d3ff187 (diff) |
more python2/3 compat
Diffstat (limited to 'wscript')
-rw-r--r-- | wscript | 9 |
1 files changed, 2 insertions, 7 deletions
@@ -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: |