From 63396e2ed62be9b58c460ca6b10e434717c580b6 Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Mon, 20 Nov 2023 15:12:59 +1100 Subject: sb: Fix Python 3.12 safeConfigParser and invalid escape sequences Updates #4968 --- source-builder/sb/pkgconfig.py | 4 ++-- source-builder/sb/version.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source-builder/sb/pkgconfig.py b/source-builder/sb/pkgconfig.py index 198ec80..bfe769f 100755 --- a/source-builder/sb/pkgconfig.py +++ b/source-builder/sb/pkgconfig.py @@ -90,7 +90,7 @@ class package(object): get_recursion = ['cflags', 'libs'] no_dup_flags = ['-I', '-l', '-L'] dual_opts = ['-D', '-U', '-I', '-l', '-L'] - lib_list_splitter = re.compile('[\s,]+') + lib_list_splitter = re.compile(r'[\s,]+') loaded_prefixes = None loaded = {} @@ -514,7 +514,7 @@ class package(object): return None s = '' if self.file_: - mre = re.compile('\$\{[^\}]+\}') + mre = re.compile(r'\$\{[^\}]+\}') s = self.fields[label.lower()] expanded = True tm = False diff --git a/source-builder/sb/version.py b/source-builder/sb/version.py index 4ec7cfa..eb6a17d 100644 --- a/source-builder/sb/version.py +++ b/source-builder/sb/version.py @@ -110,7 +110,7 @@ def _load_released_version_config(): import configparser except ImportError: import ConfigParser as configparser - v = configparser.SafeConfigParser() + v = configparser.ConfigParser() try: v.read(path.host(ver)) except Exception as e: -- cgit v1.2.3