| Message ID | 20240426040716.52126-1-jason.andryuk@amd.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | xen/x86: Fix Syntax warning in gen-cpuid.py | expand |
On 26/04/2024 5:07 am, Jason Andryuk wrote: > Python 3.12.2 warns: > > xen/tools/gen-cpuid.py:50: SyntaxWarning: invalid escape sequence '\s' > "\s+([\s\d]+\*[\s\d]+\+[\s\d]+)\)" > xen/tools/gen-cpuid.py:51: SyntaxWarning: invalid escape sequence '\s' > "\s+/\*([\w!]*) .*$") > > Specify the strings as raw strings so '\s' is read as literal '\' + 's'. > This avoids escaping all the '\'s in the strings. > > Signed-off-by: Jason Andryuk <jason.andryuk@amd.com> That's something I didn't know about how python does string concatenation. I was expecting the whole string to be considered raw, not just the first line. Acked-by: Andrew Cooper <andrew.cooper3@citrix.com> I'll rebase my pending change altering the regex over this.
diff --git a/xen/tools/gen-cpuid.py b/xen/tools/gen-cpuid.py index bf3f9ec01e..dadeb33080 100755 --- a/xen/tools/gen-cpuid.py +++ b/xen/tools/gen-cpuid.py @@ -47,8 +47,8 @@ def parse_definitions(state): """ feat_regex = re.compile( r"^XEN_CPUFEATURE\(([A-Z0-9_]+)," - "\s+([\s\d]+\*[\s\d]+\+[\s\d]+)\)" - "\s+/\*([\w!]*) .*$") + r"\s+([\s\d]+\*[\s\d]+\+[\s\d]+)\)" + r"\s+/\*([\w!]*) .*$") word_regex = re.compile( r"^/\* .* word (\d*) \*/$")
Python 3.12.2 warns: xen/tools/gen-cpuid.py:50: SyntaxWarning: invalid escape sequence '\s' "\s+([\s\d]+\*[\s\d]+\+[\s\d]+)\)" xen/tools/gen-cpuid.py:51: SyntaxWarning: invalid escape sequence '\s' "\s+/\*([\w!]*) .*$") Specify the strings as raw strings so '\s' is read as literal '\' + 's'. This avoids escaping all the '\'s in the strings. Signed-off-by: Jason Andryuk <jason.andryuk@amd.com> --- xen/tools/gen-cpuid.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)