Skip to content

Commit c5d2bac

Browse files
Ariel Otilibiliborkmann
authored andcommitted
selftests/bpf: Clear out Python syntax warnings
Invalid escape sequences are used, and produced syntax warnings: $ test_bpftool_synctypes.py test_bpftool_synctypes.py:69: SyntaxWarning: invalid escape sequence '\[' self.start_marker = re.compile(f'(static )?const bool {self.array_name}\[.*\] = {{\n') test_bpftool_synctypes.py:83: SyntaxWarning: invalid escape sequence '\[' pattern = re.compile('\[(BPF_\w*)\]\s*= (true|false),?$') test_bpftool_synctypes.py:181: SyntaxWarning: invalid escape sequence '\s' pattern = re.compile('^\s*(BPF_\w+),?(\s+/\*.*\*/)?$') test_bpftool_synctypes.py:229: SyntaxWarning: invalid escape sequence '\*' start_marker = re.compile(f'\*{block_name}\* := {{') test_bpftool_synctypes.py:229: SyntaxWarning: invalid escape sequence '\*' start_marker = re.compile(f'\*{block_name}\* := {{') test_bpftool_synctypes.py:230: SyntaxWarning: invalid escape sequence '\*' pattern = re.compile('\*\*([\w/-]+)\*\*') test_bpftool_synctypes.py:248: SyntaxWarning: invalid escape sequence '\s' start_marker = re.compile(f'"\s*{block_name} := {{') test_bpftool_synctypes.py:249: SyntaxWarning: invalid escape sequence '\w' pattern = re.compile('([\w/]+) [|}]') test_bpftool_synctypes.py:267: SyntaxWarning: invalid escape sequence '\s' start_marker = re.compile(f'"\s*{macro}\s*" [|}}]') test_bpftool_synctypes.py:267: SyntaxWarning: invalid escape sequence '\s' start_marker = re.compile(f'"\s*{macro}\s*" [|}}]') test_bpftool_synctypes.py:268: SyntaxWarning: invalid escape sequence '\w' pattern = re.compile('([\w-]+) ?(?:\||}[ }\]])') test_bpftool_synctypes.py:287: SyntaxWarning: invalid escape sequence '\w' pattern = re.compile('(?:.*=\')?([\w/]+)') test_bpftool_synctypes.py:319: SyntaxWarning: invalid escape sequence '\w' pattern = re.compile('([\w-]+) ?(?:\||}[ }\]"])') test_bpftool_synctypes.py:341: SyntaxWarning: invalid escape sequence '\|' start_marker = re.compile('\|COMMON_OPTIONS\| replace:: {') test_bpftool_synctypes.py:342: SyntaxWarning: invalid escape sequence '\*' pattern = re.compile('\*\*([\w/-]+)\*\*') Escaping them clears out the warnings. $ tools/testing/selftests/bpf/test_bpftool_synctypes.py; echo $? 0 Signed-off-by: Ariel Otilibili <[email protected]> Signed-off-by: Daniel Borkmann <[email protected]> Tested-by: Quentin Monnet <[email protected]> Reviewed-by: Quentin Monnet <[email protected]> Link: https://docs.python.org/3/library/re.html Link: https://lore.kernel.org/bpf/[email protected]
1 parent 8eef6ac commit c5d2bac

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

tools/testing/selftests/bpf/test_bpftool_synctypes.py

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ class ArrayParser(BlockParser):
6666

6767
def __init__(self, reader, array_name):
6868
self.array_name = array_name
69-
self.start_marker = re.compile(f'(static )?const bool {self.array_name}\[.*\] = {{\n')
69+
self.start_marker = re.compile(fr'(static )?const bool {self.array_name}\[.*\] = {{\n')
7070
super().__init__(reader)
7171

7272
def search_block(self):
@@ -80,7 +80,7 @@ def parse(self):
8080
Parse a block and return data as a dictionary. Items to extract must be
8181
on separate lines in the file.
8282
"""
83-
pattern = re.compile('\[(BPF_\w*)\]\s*= (true|false),?$')
83+
pattern = re.compile(r'\[(BPF_\w*)\]\s*= (true|false),?$')
8484
entries = set()
8585
while True:
8686
line = self.reader.readline()
@@ -178,7 +178,7 @@ def get_enum(self, enum_name):
178178
@enum_name: name of the enum to parse
179179
"""
180180
start_marker = re.compile(f'enum {enum_name} {{\n')
181-
pattern = re.compile('^\s*(BPF_\w+),?(\s+/\*.*\*/)?$')
181+
pattern = re.compile(r'^\s*(BPF_\w+),?(\s+/\*.*\*/)?$')
182182
end_marker = re.compile('^};')
183183
parser = BlockParser(self.reader)
184184
parser.search_block(start_marker)
@@ -226,8 +226,8 @@ def get_rst_list(self, block_name):
226226
227227
@block_name: name of the blog to parse, 'TYPE' in the example
228228
"""
229-
start_marker = re.compile(f'\*{block_name}\* := {{')
230-
pattern = re.compile('\*\*([\w/-]+)\*\*')
229+
start_marker = re.compile(fr'\*{block_name}\* := {{')
230+
pattern = re.compile(r'\*\*([\w/-]+)\*\*')
231231
end_marker = re.compile('}\n')
232232
return self.__get_description_list(start_marker, pattern, end_marker)
233233

@@ -245,8 +245,8 @@ def get_help_list(self, block_name):
245245
246246
@block_name: name of the blog to parse, 'TYPE' in the example
247247
"""
248-
start_marker = re.compile(f'"\s*{block_name} := {{')
249-
pattern = re.compile('([\w/]+) [|}]')
248+
start_marker = re.compile(fr'"\s*{block_name} := {{')
249+
pattern = re.compile(r'([\w/]+) [|}]')
250250
end_marker = re.compile('}')
251251
return self.__get_description_list(start_marker, pattern, end_marker)
252252

@@ -264,8 +264,8 @@ def get_help_list_macro(self, macro):
264264
265265
@macro: macro starting the block, 'HELP_SPEC_OPTIONS' in the example
266266
"""
267-
start_marker = re.compile(f'"\s*{macro}\s*" [|}}]')
268-
pattern = re.compile('([\w-]+) ?(?:\||}[ }\]])')
267+
start_marker = re.compile(fr'"\s*{macro}\s*" [|}}]')
268+
pattern = re.compile(r'([\w-]+) ?(?:\||}[ }\]])')
269269
end_marker = re.compile('}\\\\n')
270270
return self.__get_description_list(start_marker, pattern, end_marker)
271271

@@ -283,8 +283,8 @@ def get_bashcomp_list(self, block_name):
283283
284284
@block_name: name of the blog to parse, 'TYPE' in the example
285285
"""
286-
start_marker = re.compile(f'local {block_name}=\'')
287-
pattern = re.compile('(?:.*=\')?([\w/]+)')
286+
start_marker = re.compile(fr'local {block_name}=\'')
287+
pattern = re.compile(r'(?:.*=\')?([\w/]+)')
288288
end_marker = re.compile('\'$')
289289
return self.__get_description_list(start_marker, pattern, end_marker)
290290

@@ -316,7 +316,7 @@ def get_common_options(self):
316316
{'-p', '-d', '--pretty', '--debug', '--json', '-j'}
317317
"""
318318
start_marker = re.compile(f'"OPTIONS :=')
319-
pattern = re.compile('([\w-]+) ?(?:\||}[ }\]"])')
319+
pattern = re.compile(r'([\w-]+) ?(?:\||}[ }\]"])')
320320
end_marker = re.compile('#define')
321321

322322
parser = InlineListParser(self.reader)
@@ -338,8 +338,8 @@ def get_common_options(self):
338338
339339
{'-p', '-d', '--pretty', '--debug', '--json', '-j'}
340340
"""
341-
start_marker = re.compile('\|COMMON_OPTIONS\| replace:: {')
342-
pattern = re.compile('\*\*([\w/-]+)\*\*')
341+
start_marker = re.compile(r'\|COMMON_OPTIONS\| replace:: {')
342+
pattern = re.compile(r'\*\*([\w/-]+)\*\*')
343343
end_marker = re.compile('}$')
344344

345345
parser = InlineListParser(self.reader)

0 commit comments

Comments
 (0)