From df0ebc6dfc2879927d6fe3e18a6f21cb3776cda3 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 | 14 +++++++------- platform/linuxbsd/detect.py | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/methods.py b/methods.py index a6416ccdd29..7067c219461 100644 --- a/methods.py +++ b/methods.py @@ -1016,13 +1016,13 @@ def get_compiler_version(env): else: # TODO: Implement for MSVC return None match = re.search( - "(?:(?<=version )|(?<=\) )|(?<=^))" - "(?P\d+)" - "(?:\.(?P\d*))?" - "(?:\.(?P\d*))?" - "(?:-(?P[0-9a-zA-Z-]*))?" - "(?:\+(?P[0-9a-zA-Z-]*))?" - "(?: (?P[0-9]{8}|[0-9]{6})(?![0-9a-zA-Z]))?", + r"(?:(?<=version )|(?<=\) )|(?<=^))" + r"(?P\d+)" + r"(?:\.(?P\d*))?" + r"(?:\.(?P\d*))?" + r"(?:-(?P[0-9a-zA-Z-]*))?" + r"(?:\+(?P[0-9a-zA-Z-]*))?" + r"(?: (?P[0-9]{8}|[0-9]{6})(?![0-9a-zA-Z]))?", version, ) if match is not None: diff --git a/platform/linuxbsd/detect.py b/platform/linuxbsd/detect.py index a723bb5d584..571d2a47d85 100644 --- a/platform/linuxbsd/detect.py +++ b/platform/linuxbsd/detect.py @@ -455,7 +455,7 @@ def configure(env: "Environment"): 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."