3 files changed, 19 insertions, 6 deletions
diff --git a/BuildTools/SCons/Tools/WindowsBundle.py b/BuildTools/SCons/Tools/WindowsBundle.py
index 4d73fa3..9781deb 100644
--- a/BuildTools/SCons/Tools/WindowsBundle.py
+++ b/BuildTools/SCons/Tools/WindowsBundle.py
@@ -33,9 +33,13 @@ def generate(env) :
            mappings = []
-            p = re.compile(r'"([^\"]*)" "([^\"]*)"')
+            regex = re.compile(r'"([^\"]*)" "([^\"]*)"')
+            if SCons.Util.PY3:
+                matches = re.findall(regex, stdout.decode('utf8'))
+            else:
+                matches = re.findall(regex, stdout)
-            matches = re.findall(p, stdout)
            for match in matches:
                mappings.append(match)
            return mappings
diff --git a/BuildTools/SCons/Tools/wix.py b/BuildTools/SCons/Tools/wix.py
index 889afe4..986ea23 100644
--- a/BuildTools/SCons/Tools/wix.py
+++ b/BuildTools/SCons/Tools/wix.py
@@ -15,7 +15,10 @@ def generate(env) :
    def WiX_IncludeScanner(source, env, path, arg):
        wixIncludeRegexp = re.compile(r'^\s*\<\?include (\S+.wxs)\s*\?\>\S*', re.M)
-        contents = source.get_contents()
+        if SCons.Util.PY3:
+            contents = source.get_contents().decode("utf8")
+        else:
+            contents = source.get_contents()
        includes = wixIncludeRegexp.findall(contents)
        return [ "" + include for include in includes ]
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript
index 584cfea..96979c0 100644
--- a/Swift/QtUI/SConscript
+++ b/Swift/QtUI/SConscript
@@ -1,5 +1,6 @@
 import os, datetime, re, time
 import Version
+import SCons.Util
 def generateQRCTheme(dir, prefix) :
    sourceDir = dir.abspath
@@ -475,11 +476,16 @@ if env["PLATFORM"] == "win32" :
        #myenv.Nsis("../Packaging/nsis/swift.nsi")
        if env["SCONS_STAGE"] == "build" and env.get("wix_bindir", None):
            def convertToRTF(env, target, source) :
-                infile = open(source[0].abspath, 'r')
+                if SCons.Util.PY3:
-                outfile = open(target[0].abspath, 'w')
+                    infile = open(source[0].abspath, 'r', encoding="utf8")
+                    outfile = open(target[0].abspath, 'w', encoding="utf8")
+                else:
+                    infile = open(source[0].abspath, 'r')
+                    outfile = open(target[0].abspath, 'w')
                outfile.write('{\\rtf1\\ansi{\\fonttbl\\f0\\fswiss Helvetica;}\\fs16\\f0\\pard\n')
                for line in infile:
-                    for char in line.decode("utf-8") :
+                    line = line if SCons.Util.PY3 else line.decode("utf-8")
+                    for char in line :
                        if ord(char) > 127 :
                            # FIXME: This is incorrect, because it only works for latin1.
                            # The correct way is \u<decimal utf16 point>? , but this is more