summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'BuildTools/SCons/Tools')
-rw-r--r--BuildTools/SCons/Tools/WindowsBundle.py8
-rw-r--r--BuildTools/SCons/Tools/wix.py5
2 files changed, 10 insertions, 3 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 ]