fix wscripts to work with python3.

encode/decode return byte arrays in python3, not strings
This commit is contained in:
Paul Davis
2015-07-06 10:05:49 -04:00
parent d26a57d377
commit 1e169ea3e8

View File

@@ -180,9 +180,11 @@ else:
V = MAJOR + '.' + MINOR + '.' + MICRO
# Ensure that these are not unicode, which
# can cause odd problems elsewhere
VERSION = V.encode ('ascii', 'ignore')
PROGRAM_VERSION = MAJOR.encode ('ascii', 'ignore')
# 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'))
# Mandatory variables
top = '.'