On 16/12/2024 11:07 pm, Ariel Otilibili wrote:
> * since 3.12 invalid escape sequences generate SyntaxWarning
> * in the future, these invalid sequences will generate SyntaxError
> * therefore changed syntax to raw string notation.
>
> Link: https://docs.python.org/3/whatsnew/3.12.html#other-language-changes
> Fixes: d8f3a67bf98 ("pygrub: further improve grub2 support")
> Fixes: dd03048708a ("xen/pygrub: grub2/grub.cfg from RHEL 7 has new commands
> in menuentry")
> Fixes: d1b93ea2615 ("tools/pygrub: Make pygrub understand default entry in
> string format")
> Fixes: 622e368758b ("Add ZFS libfsimage support patch")
> Fixes: 02b26c02c7c ("xen/scripts: add cppcheck tool to the xen-analysis.py
> script")
> Fixes: 56c0063f4e7 ("xen/misra: xen-analysis.py: Improve the cppcheck version
> check")
>
> Cc: Anthony PERARD <[email protected]>
> Cc: Luca Fancellu <[email protected]>
> Cc: Andrew Cooper <[email protected]>
> Signed-off-by: Ariel Otilibili <[email protected]>
Having poked about a bit more, this is all a big mess, but these do now
work with Py3.12.
leading \ for non-special characters are ignored in [], which is why ...
> ---
> tools/pygrub/src/GrubConf.py | 4 ++--
> tools/pygrub/src/pygrub | 6 +++---
> xen/scripts/xen_analysis/cppcheck_analysis.py | 4 ++--
> 3 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/tools/pygrub/src/GrubConf.py b/tools/pygrub/src/GrubConf.py
> index 580c9628ca..904e7d5567 100644
> --- a/tools/pygrub/src/GrubConf.py
> +++ b/tools/pygrub/src/GrubConf.py
> @@ -320,7 +320,7 @@ class GrubConfigFile(_GrubConfigFile):
> def grub2_handle_set(arg):
> (com,arg) = grub_split(arg,2)
> com="set:" + com
> - m = re.match("([\"\'])(.*)\\1", arg)
> + m = re.match(r"([\"\'])(.*)\1", arg)
... the \' works here.
Anyway, I've checked the others and they seem to work, so I suggest
taking this roughly this form.
Some notes about the commit message. The subject ought to be:
tools: Fix syntax warnings with Python 3.12
The text should be a regular paragraph, rather than bullet points like this.
I can fix this all on commit if you're happy.
~Andrew
