From 1e169ea3e8cad35db3ea533b2fb69e31478f00c2 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 6 Jul 2015 10:05:49 -0400 Subject: [PATCH] fix wscripts to work with python3. encode/decode return byte arrays in python3, not strings --- wscript | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/wscript b/wscript index cb01228be9..7d806858a0 100644 --- a/wscript +++ b/wscript @@ -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 = '.' -- 2.30.2