From nobody Thu May 15 10:30:06 2025 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16995375181081004.9131567522917; Thu, 9 Nov 2023 05:45:18 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r15KZ-0008KD-3M; Thu, 09 Nov 2023 08:44:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r15KU-00081b-0S; Thu, 09 Nov 2023 08:44:18 -0500 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r15KN-00014x-NL; Thu, 09 Nov 2023 08:44:14 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 7315231B00; Thu, 9 Nov 2023 16:43:11 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 80E3E344A7; Thu, 9 Nov 2023 16:43:03 +0300 (MSK) Received: (nullmailer pid 1461788 invoked by uid 1000); Thu, 09 Nov 2023 13:43:02 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Paolo Bonzini , Michael Tokarev Subject: [Stable-8.1.3 09/55] tests/vm: avoid invalid escape in Python string Date: Thu, 9 Nov 2023 16:42:13 +0300 Message-Id: <20231109134300.1461632-9-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZM-MESSAGEID: 1699537519163100003 Content-Type: text/plain; charset="utf-8" From: Paolo Bonzini This is an error in Python 3.12; fix it by using a raw string literal or by double-escaping the backslash. Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini (cherry picked from commit 86a8989d4557a09b68f8b78b6c3fb6ad3f23ca6f) Signed-off-by: Michael Tokarev diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index a97e23b0ce..6e31698906 100644 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -331,8 +331,8 @@ def console_init(self, timeout =3D None): def console_log(self, text): for line in re.split("[\r\n]", text): # filter out terminal escape sequences - line =3D re.sub("\x1b\[[0-9;?]*[a-zA-Z]", "", line) - line =3D re.sub("\x1b\([0-9;?]*[a-zA-Z]", "", line) + line =3D re.sub("\x1b\\[[0-9;?]*[a-zA-Z]", "", line) + line =3D re.sub("\x1b\\([0-9;?]*[a-zA-Z]", "", line) # replace unprintable chars line =3D re.sub("\x1b", "", line) line =3D re.sub("[\x00-\x1f]", ".", line) @@ -530,7 +530,7 @@ def get_qemu_version(qemu_path): and return the major number.""" output =3D subprocess.check_output([qemu_path, '--version']) version_line =3D output.decode("utf-8") - version_num =3D re.split(' |\(', version_line)[3].split('.')[0] + version_num =3D re.split(r' |\(', version_line)[3].split('.')[0] return int(version_num) =20 def parse_config(config, args): --=20 2.39.2