From patchwork Mon Dec 16 23:07:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ariel Otilibili-Anieli X-Patchwork-Id: 13910663 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 217C1E77184 for ; Mon, 16 Dec 2024 23:12:11 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.858487.1270733 (Exim 4.92) (envelope-from ) id 1tNKFk-0007xl-0A; Mon, 16 Dec 2024 23:11:52 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 858487.1270733; Mon, 16 Dec 2024 23:11:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tNKFj-0007xe-Sw; Mon, 16 Dec 2024 23:11:51 +0000 Received: by outflank-mailman (input) for mailman id 858487; Mon, 16 Dec 2024 23:11:51 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tNKFj-0007ir-1L for xen-devel@lists.xenproject.org; Mon, 16 Dec 2024 23:11:51 +0000 Received: from smtp.eurecom.fr (smtp.eurecom.fr [193.55.113.210]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 216e6bec-bc03-11ef-a0d6-8be0dac302b0; Tue, 17 Dec 2024 00:11:50 +0100 (CET) Received: from waha.eurecom.fr (HELO smtps.eurecom.fr) ([10.3.2.236]) by drago1i.eurecom.fr with ESMTP; 17 Dec 2024 00:11:50 +0100 Received: from localhost.localdomain (88-183-119-157.subs.proxad.net [88.183.119.157]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtps.eurecom.fr (Postfix) with ESMTPSA id 097E82EAD; Tue, 17 Dec 2024 00:11:50 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 216e6bec-bc03-11ef-a0d6-8be0dac302b0 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=eurecom.fr; i=@eurecom.fr; q=dns/txt; s=default; t=1734390710; x=1765926710; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=EAV3EgAj1GYsZmin1Xq2+9I5AZcWLnfwtgtwG2gVjYg=; b=IrZPj1cCGpaJot7reh5OjbrUGmMMLt+TisnAzE4O3r8eXTbXqNvYQS9X iYsK4MuHs8sjZxfoyEGnKdNQReYsaG3TxzVuOsyZ7kdTlO4H+8FcM4AIm f1cB8AaapBNylbRxxjg2HrlqtsB7q02/1UWmbDExRtkYB1zIRm7fQyrNs w=; X-CSE-ConnectionGUID: 0BvNt6iFQOyKj1wBH835hw== X-CSE-MsgGUID: VLier6ySR0GDCknW79bYLA== X-IronPort-AV: E=Sophos;i="6.12,240,1728943200"; d="scan'208";a="28208512" From: Ariel Otilibili To: xen-devel@lists.xenproject.org Cc: Jan Beulich , Anthony PERARD , Andrew Cooper , Ariel Otilibili , Luca Fancellu Subject: [PATCH v2 1/1] tools, xen/scripts: clear out Python syntax warnings Date: Tue, 17 Dec 2024 00:07:20 +0100 Message-ID: <20241216231128.211648-2-Ariel.Otilibili-Anieli@eurecom.fr> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241216231128.211648-1-Ariel.Otilibili-Anieli@eurecom.fr> References: <20241214161350.70515-1-Ariel.Otilibili-Anieli@eurecom.fr> <20241216231128.211648-1-Ariel.Otilibili-Anieli@eurecom.fr> MIME-Version: 1.0 * 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 Cc: Luca Fancellu Cc: Andrew Cooper Signed-off-by: Ariel Otilibili Reviewed-by: Luca Fancellu --- 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) if m is not None: arg=m.group(2) return (com,arg) @@ -402,7 +402,7 @@ class Grub2ConfigFile(_GrubConfigFile): continue # new image - title_match = re.match('^menuentry ["\'](.*?)["\'] (.*){', l) + title_match = re.match(r'^menuentry ["\'](.*?)["\'] (.*){', l) if title_match: if img is not None: raise RuntimeError("syntax error: cannot nest menuentry (%d %s)" % (len(img),img)) diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub index 9d51f96070..e1657c494b 100755 --- a/tools/pygrub/src/pygrub +++ b/tools/pygrub/src/pygrub @@ -614,7 +614,7 @@ class Grub: title = self.cf.default while 1: try: - title = re.search('(\S)>(\S.+$)',title).group(2) + title = re.search(r'(\S)>(\S.+$)',title).group(2) except AttributeError: break @@ -1039,7 +1039,7 @@ if __name__ == "__main__": # if boot filesystem is set then pass to fsimage.open bootfsargs = '"%s"' % incfg["args"] - bootfsgroup = re.findall('zfs-bootfs=(.*?)[\s\,\"]', bootfsargs) + bootfsgroup = re.findall(r'zfs-bootfs=(.*?)[\s\,\"]', bootfsargs) if bootfsgroup: bootfsoptions = bootfsgroup[0] else: @@ -1104,7 +1104,7 @@ if __name__ == "__main__": if chosencfg["args"]: zfsinfo = xenfsimage.getbootstring(fs) if zfsinfo is not None: - e = re.compile("zfs-bootfs=[\w\-\.\:@/]+" ) + e = re.compile(r"zfs-bootfs=[\w\-.:@/]+" ) (chosencfg["args"],count) = e.subn(zfsinfo, chosencfg["args"]) if count == 0: chosencfg["args"] += " -B %s" % zfsinfo diff --git a/xen/scripts/xen_analysis/cppcheck_analysis.py b/xen/scripts/xen_analysis/cppcheck_analysis.py index 850335c998..ce7bda91b6 100644 --- a/xen/scripts/xen_analysis/cppcheck_analysis.py +++ b/xen/scripts/xen_analysis/cppcheck_analysis.py @@ -93,7 +93,7 @@ def __generate_suppression_list(out_file): # start of a comment '/*' comment_line_starts = re.match('^[ \t]*/\*.*$', line) # Matches a line with text and the end of a comment '*/' - comment_line_stops = re.match('^.*\*/$', line) + comment_line_stops = re.match(r'^.*\*/$', line) if (not comment_section) and comment_line_starts: comment_section = True if (len(line.strip()) != 0) and (not comment_section): @@ -157,7 +157,7 @@ def generate_cppcheck_deps(): "Error occured retrieving cppcheck version:\n{}\n\n{}" ) - version_regex = re.search('^Cppcheck (\d+)\.(\d+)(?:\.\d+)?$', + version_regex = re.search(r'^Cppcheck (\d+)\.(\d+)(?:\.\d+)?$', invoke_cppcheck, flags=re.M) # Currently, only cppcheck version >= 2.7 is supported, but version 2.8 is # known to be broken, please refer to docs/misra/cppcheck.txt