From 304f453b019b58ea0a28c6c061f533b30011c0df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Mon, 25 Sep 2023 10:39:30 +0200 Subject: [PATCH] SCons: Fix Python 3.12 SyntaxError with regex escape sequences (cherry picked from commit b362976504c3346b9f34b69dcad0838d1d381037) --- methods.py | 2 +- platform/x11/detect.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/methods.py b/methods.py index c1ea3858a51..c5f835015d6 100644 --- a/methods.py +++ b/methods.py @@ -1076,7 +1076,7 @@ def get_compiler_version(env): return None else: # TODO: Implement for MSVC return None - match = re.search("[0-9]+\.[0-9.]+", version) + match = re.search(r"[0-9]+\.[0-9.]+", version) if match is not None: return list(map(int, match.group().split("."))) else: diff --git a/platform/x11/detect.py b/platform/x11/detect.py index b365cf6c66a..44b9b6ee11e 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -429,7 +429,7 @@ def configure(env): linker_version_str = subprocess.check_output( [env.subst(env["LINK"]), "-Wl,--version"] + env.subst(env["LINKFLAGS"]) ).decode("utf-8") - gnu_ld_version = re.search("^GNU ld [^$]*(\d+\.\d+)$", linker_version_str, re.MULTILINE) + gnu_ld_version = re.search(r"^GNU ld [^$]*(\d+\.\d+)$", linker_version_str, re.MULTILINE) if not gnu_ld_version: print( "Warning: Creating export template binaries enabled for PCK embedding is currently only supported with GNU ld, not gold, LLD or mold."