From: Benjamin Gray <bgray@linux.ibm.com>
To: linux-kernel@vger.kernel.org, linux-ia64@vger.kernel.org,
linux-doc@vger.kernel.org, bpf@vger.kernel.org,
linux-pm@vger.kernel.org
Cc: abbotti@mev.co.uk, hsweeten@visionengravers.com,
jan.kiszka@siemens.com, kbingham@kernel.org, mykolal@fb.com,
Benjamin Gray <bgray@linux.ibm.com>
Subject: [PATCH 8/8] selftests/bpf: fix Python string escapes in f-strings
Date: Mon, 14 Aug 2023 16:07:04 +1000 [thread overview]
Message-ID: <20230814060704.79655-9-bgray@linux.ibm.com> (raw)
In-Reply-To: <20230814060704.79655-1-bgray@linux.ibm.com>
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@linux.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
prev parent reply other threads:[~2023-08-14 6:17 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-14 6:06 [PATCH 0/8] Fix Python string escapes Benjamin Gray
2023-08-14 6:06 ` [PATCH 1/8] ia64: fix " Benjamin Gray
2023-08-14 6:06 ` [PATCH 2/8] Documentation/sphinx: " Benjamin Gray
2023-08-14 13:35 ` Jonathan Corbet
2023-08-14 23:26 ` Benjamin Gray
2023-08-14 6:06 ` [PATCH 3/8] drivers/comedi: " Benjamin Gray
2023-08-14 6:07 ` [PATCH 4/8] scripts: " Benjamin Gray
2023-08-14 6:07 ` [PATCH 5/8] tools/perf: " Benjamin Gray
2023-08-14 6:07 ` [PATCH 6/8] tools/power: " Benjamin Gray
2023-08-14 6:07 ` [PATCH 7/8] selftests/bpf: " Benjamin Gray
2023-08-14 6:07 ` Benjamin Gray [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230814060704.79655-9-bgray@linux.ibm.com \
--to=bgray@linux.ibm.com \
--cc=abbotti@mev.co.uk \
--cc=bpf@vger.kernel.org \
--cc=hsweeten@visionengravers.com \
--cc=jan.kiszka@siemens.com \
--cc=kbingham@kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=mykolal@fb.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).