buildman: Correct some warnings about regex strings
With Python 3.12 some warnings have cropped up. Fix them.
Signed-off-by: Simon Glass <sjg@chromium.org>
diff --git a/tools/buildman/builder.py b/tools/buildman/builder.py
index 4090d32..cbf1345 100644
--- a/tools/buildman/builder.py
+++ b/tools/buildman/builder.py
@@ -34,7 +34,7 @@
# Error in reading or end of file.
# <<
# which indicates that BREAK_ME has an empty default
-RE_NO_DEFAULT = re.compile(b'\((\w+)\) \[] \(NEW\)')
+RE_NO_DEFAULT = re.compile(br'\((\w+)\) \[] \(NEW\)')
# Symbol types which appear in the bloat feature (-B). Others are silently
# dropped when reading in the 'nm' output
@@ -374,9 +374,9 @@
self._re_function = re.compile('(.*): In function.*')
self._re_files = re.compile('In file included from.*')
- self._re_warning = re.compile('(.*):(\d*):(\d*): warning: .*')
+ self._re_warning = re.compile(r'(.*):(\d*):(\d*): warning: .*')
self._re_dtb_warning = re.compile('(.*): Warning .*')
- self._re_note = re.compile('(.*):(\d*):(\d*): note: this is the location of the previous.*')
+ self._re_note = re.compile(r'(.*):(\d*):(\d*): note: this is the location of the previous.*')
self._re_migration_warning = re.compile(r'^={21} WARNING ={22}\n.*\n=+\n',
re.MULTILINE | re.DOTALL)
diff --git a/tools/buildman/toolchain.py b/tools/buildman/toolchain.py
index a7d7883..0c8a4fa 100644
--- a/tools/buildman/toolchain.py
+++ b/tools/buildman/toolchain.py
@@ -440,12 +440,12 @@
This converts ${blah} within the string to the value of blah.
This function works recursively.
+ Resolved string
+
Args:
var_dict: Dictionary containing variables and their values
args: String containing make arguments
Returns:
- Resolved string
-
>>> bsettings.setup(None)
>>> tcs = Toolchains()
>>> tcs.Add('fred', False)
@@ -456,7 +456,7 @@
>>> tcs.ResolveReferences(var_dict, 'this=${oblique}_set${first}nd')
'this=OBLIQUE_setfi2ndrstnd'
"""
- re_var = re.compile('(\$\{[-_a-z0-9A-Z]{1,}\})')
+ re_var = re.compile(r'(\$\{[-_a-z0-9A-Z]{1,}\})')
while True:
m = re_var.search(args)
@@ -495,7 +495,7 @@
self._make_flags['target'] = brd.target
arg_str = self.ResolveReferences(self._make_flags,
self._make_flags.get(brd.target, ''))
- args = re.findall("(?:\".*?\"|\S)+", arg_str)
+ args = re.findall(r"(?:\".*?\"|\S)+", arg_str)
i = 0
while i < len(args):
args[i] = args[i].replace('"', '')