From nobody Fri Nov 14 15:21:06 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1762356186; cv=none; d=zohomail.com; s=zohoarc; b=Cm8A9fAye+MJRlu3rn4Tk2ebP/5eFiIZI8pWSJ3iD/FeX+6NebKAqNJW0wltwE6wlLmZKzcU3NsaxlbJfp0RcOuU2aiGb1mVoLlYHma61jQE98z5vAYfWyxeRkY8oz3apUTjTgpCQLbm72k2QSieZ9HxWk+SpH4EI9nFLfXiSpE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1762356186; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ZxN1/sJkXIkgfPdR4ACmuVXQYkfgeuGtDX6CwgvNIdY=; b=Pd3rrXh3l3R/U4nPTKqnMZJTrphE22v7WJOwZTZ1NaLQD7K7EAG2oRjxHn0GwTDRTdXX7wC19o+pdld1ZLYAQvf4s7y8FDt6n7FXIvQAUwGKK4jPu6fiyFWzjWNQGJ1DdRN2UNaEIg9QoPnVJWV1VLYBOHwVhBJ46ga0oY8cbgs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 176235618633520.36430919689235; Wed, 5 Nov 2025 07:23:06 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vGfLE-0001l8-Hj; Wed, 05 Nov 2025 10:22:32 -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 1vGfLB-0001kk-OI for qemu-devel@nongnu.org; Wed, 05 Nov 2025 10:22:29 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vGfLA-0007cp-CJ for qemu-devel@nongnu.org; Wed, 05 Nov 2025 10:22:29 -0500 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-131-CpcMsgxXPna-tTiY4V1rRA-1; Wed, 05 Nov 2025 10:22:24 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9AB5C1956095; Wed, 5 Nov 2025 15:22:22 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.45.242.18]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E30D1300018D; Wed, 5 Nov 2025 15:22:21 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 37D1321E6A27; Wed, 05 Nov 2025 16:22:19 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1762356145; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=ZxN1/sJkXIkgfPdR4ACmuVXQYkfgeuGtDX6CwgvNIdY=; b=hmzTc9JSpRvfKLJkl7fTWvsfJpIrVeGFQLUMAu9cizIsGvb5Q85QpBxbE7EjuU9doMIhL+ p4YJikbaBml4BovX5aUJk9Zq2Ge9Eg5WPnkKgvDfiSokRNlSP95FvmeNG10Tbnp689yNNz tn8EJLsG/l3grLFmO+B7yBPmmhl8vFc= X-MC-Unique: CpcMsgxXPna-tTiY4V1rRA-1 X-Mimecast-MFC-AGG-ID: CpcMsgxXPna-tTiY4V1rRA_1762356143 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: richard.henderson@linaro.org, vsementsov@yandex-team.ru Subject: [PATCH] qapi/parser: Mollify mypy Date: Wed, 5 Nov 2025 16:22:19 +0100 Message-ID: <20251105152219.311154-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.517, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1762356190005154100 Content-Type: text/plain; charset="utf-8" re.match(r'^ *', ...) can't fail, but mypy doesn't know that and complains: scripts/qapi/parser.py:444: error: Item "None" of "Match[str] | None" h= as no attribute "end" [union-attr] Work around by using must_match() instead. Fixes: 8107ba47fd78 (qapi: Add documentation format validation) Signed-off-by: Markus Armbruster Reviewed-by: Vladimir Sementsov-Ogievskiy --- scripts/qapi/parser.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/qapi/parser.py b/scripts/qapi/parser.py index 1bb1af7051..c3cf33904e 100644 --- a/scripts/qapi/parser.py +++ b/scripts/qapi/parser.py @@ -441,7 +441,7 @@ def get_doc_line(self) -> Optional[str]: self._literal_mode =3D True self._literal_mode_indent =3D 0 elif self._literal_mode and line: - indent =3D re.match(r'^ *', line).end() + indent =3D must_match(r'\s*', line).end() if self._literal_mode_indent =3D=3D 0: self._literal_mode_indent =3D indent elif indent < self._literal_mode_indent: --=20 2.49.0