summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2018-10-01 10:04:11 (GMT)
committerTobias Markmann <tm@ayena.de>2018-10-01 10:04:11 (GMT)
commit78373f300882ebad10eda79eab7ee1e8a8d82b93 (patch)
tree41fe3f05990b79ee4d2c013f0d208c3d917171e8 /BuildTools/SCons/Tools
parentabd5ca5d4960765f25da426c3dd20e2316d75b59 (diff)
downloadswift-78373f300882ebad10eda79eab7ee1e8a8d82b93.zip
swift-78373f300882ebad10eda79eab7ee1e8a8d82b93.tar.bz2
Change ur literals to r, as ur is unsupported in Python 3
r literal is supported by both Python 2 and Python 3. Test-Information: Builds on Windows 10 with Python 3 and VS 2015. Change-Id: I2210a1ba01a4bf3c175634adeb067f1f939a7e61
Diffstat (limited to 'BuildTools/SCons/Tools')
-rw-r--r--BuildTools/SCons/Tools/WindowsBundle.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/BuildTools/SCons/Tools/WindowsBundle.py b/BuildTools/SCons/Tools/WindowsBundle.py
index b0f7772..4d73fa3 100644
--- a/BuildTools/SCons/Tools/WindowsBundle.py
+++ b/BuildTools/SCons/Tools/WindowsBundle.py
@@ -33,7 +33,7 @@ def generate(env) :
mappings = []
- p = re.compile(ur'"([^\"]*)" "([^\"]*)"')
+ p = re.compile(r'"([^\"]*)" "([^\"]*)"')
matches = re.findall(p, stdout)
for match in matches:
@@ -97,7 +97,7 @@ def generate(env) :
break
# handle core DLLs
- qt_corelib_regex = re.compile(ur".*bin.*\\(.*)\.dll")
+ qt_corelib_regex = re.compile(r".*bin.*\\(.*)\.dll")
for qtlib in qtlibs:
if qtlib.startswith("Qt5"):
@@ -111,7 +111,7 @@ def generate(env) :
all_files += env.Install(bundle, src_path)
# handle plugins
- qt_plugin_regex = re.compile(ur".*plugins.*\\(.*)\\(.*)\.dll")
+ qt_plugin_regex = re.compile(r".*plugins.*\\(.*)\\(.*)\.dll")
for (src_path, target_path) in qtmappings:
if qt_plugin_regex.match(src_path):
plugin_folder, filename = qt_plugin_regex.match(src_path).groups()