[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20230814060704.79655-9-bgray@linux.ibm.com>
Date: Mon, 14 Aug 2023 16:07:04 +1000
From: Benjamin Gray <bgray@...ux.ibm.com>
To: linux-kernel@...r.kernel.org, linux-ia64@...r.kernel.org,
linux-doc@...r.kernel.org, bpf@...r.kernel.org,
linux-pm@...r.kernel.org
Cc: abbotti@....co.uk, hsweeten@...ionengravers.com,
jan.kiszka@...mens.com, kbingham@...nel.org, mykolal@...com,
Benjamin Gray <bgray@...ux.ibm.com>
Subject: [PATCH 8/8] selftests/bpf: fix Python string escapes in f-strings
Python 3.6 introduced a DeprecationWarning for invalid escape sequences.
This is upgraded to a SyntaxWarning in Python 3.12, and will eventually
be a syntax error.
Fix these now to get ahead of it before it's an error.
Signed-off-by: Benjamin Gray <bgray@...ux.ibm.com>
---
tools/testing/selftests/bpf/test_bpftool_synctypes.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/testing/selftests/bpf/test_bpftool_synctypes.py b/tools/testing/selftests/bpf/test_bpftool_synctypes.py
index b21bc1a35bf4..a93144b3b2b0 100755
--- a/tools/testing/selftests/bpf/test_bpftool_synctypes.py
+++ b/tools/testing/selftests/bpf/test_bpftool_synctypes.py
@@ -66,7 +66,7 @@ class ArrayParser(BlockParser):
def __init__(self, reader, array_name):
self.array_name = array_name
- self.start_marker = re.compile(f'(static )?const bool {self.array_name}\[.*\] = {{\n')
+ self.start_marker = re.compile(f'(static )?const bool {self.array_name}\\[.*\\] = {{\n')
super().__init__(reader)
def search_block(self):
@@ -226,7 +226,7 @@ class FileExtractor(object):
@block_name: name of the blog to parse, 'TYPE' in the example
"""
- start_marker = re.compile(f'\*{block_name}\* := {{')
+ start_marker = re.compile(f'\\*{block_name}\\* := {{')
pattern = re.compile('\\*\\*([\\w/-]+)\\*\\*')
end_marker = re.compile('}\n')
return self.__get_description_list(start_marker, pattern, end_marker)
@@ -245,7 +245,7 @@ class FileExtractor(object):
@block_name: name of the blog to parse, 'TYPE' in the example
"""
- start_marker = re.compile(f'"\s*{block_name} := {{')
+ start_marker = re.compile(f'"\\s*{block_name} := {{')
pattern = re.compile('([\\w/]+) [|}]')
end_marker = re.compile('}')
return self.__get_description_list(start_marker, pattern, end_marker)
@@ -264,7 +264,7 @@ class FileExtractor(object):
@macro: macro starting the block, 'HELP_SPEC_OPTIONS' in the example
"""
- start_marker = re.compile(f'"\s*{macro}\s*" [|}}]')
+ start_marker = re.compile(f'"\\s*{macro}\\s*" [|}}]')
pattern = re.compile('([\\w-]+) ?(?:\\||}[ }\\]])')
end_marker = re.compile('}\\\\n')
return self.__get_description_list(start_marker, pattern, end_marker)
--
2.41.0
Powered by blists - more mailing lists