public/qemu
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

tracetool: avoid invalid escape in Python string

Browse source 
This is an error in Python 3.12; fix it by using a raw string literal.

Cc: qemu-stable@nongnu.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
(cherry picked from commit e6d8e5e6e366ab4c9ed7d8ed1572f98c6ad6a38e)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
This commit is contained in:
Paolo Bonzini 2023-10-16 08:22:56 +02:00 committed by Michael Tokarev
parent 791cbfeec2
commit 71452f87c9
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
scripts/tracetool/__init__.py
View file

@ -210,12 +210,12 @@ class Event(object):
""" """
_CRE = re.compile("((?P<props>[\w\s]+)\s+)?" _CRE = re.compile(r"((?P<props>[\w\s]+)\s+)?"
"(?P<name>\w+)" r"(?P<name>\w+)"
"\((?P<args>[^)]*)\)" r"\((?P<args>[^)]*)\)"
"\s*" r"\s*"
"(?:(?:(?P<fmt_trans>\".+),)?\s*(?P<fmt>\".+))?" r"(?:(?:(?P<fmt_trans>\".+),)?\s*(?P<fmt>\".+))?"
"\s*") r"\s*")
_VALID_PROPS = set(["disable", "vcpu"]) _VALID_PROPS = set(["disable", "vcpu"])
@ -326,7 +326,7 @@ def __repr__(self):
fmt) fmt)
# Star matching on PRI is dangerous as one might have multiple # Star matching on PRI is dangerous as one might have multiple
# arguments with that format, hence the non-greedy version of it. # arguments with that format, hence the non-greedy version of it.
_FMT = re.compile("(%[\d\.]*\w+|%.*?PRI\S+)") _FMT = re.compile(r"(%[\d\.]*\w+|%.*?PRI\S+)")
def formats(self): def formats(self):
"""List conversion specifiers in the argument print format string.""" """List conversion specifiers in the argument print format string."""

2
scripts/tracetool/format/log_stap.py
View file

@ -83,7 +83,7 @@ def c_fmt_to_stap(fmt):
# and "%ll" is not valid at all. Similarly the size_t # and "%ll" is not valid at all. Similarly the size_t
# based "%z" size qualifier is not valid. We just # based "%z" size qualifier is not valid. We just
# strip all size qualifiers for sanity. # strip all size qualifiers for sanity.
fmt = re.sub("%(\d*)(l+|z)(x|u|d)", "%\\1\\3", "".join(bits)) fmt = re.sub(r"%(\d*)(l+|z)(x|u|d)", r"%\1\3", "".join(bits))
return fmt return fmt
def generate(events, backend, group): def generate(events, backend, group):