From nobody Mon Feb 9 13:39:01 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1600210933; cv=none; d=zohomail.com; s=zohoarc; b=Lf/WcfUvIkhJDV0+uBi8J3/FfAq93+mrN6Qa4gV2WfLwYRhK1/qU2SOoyimig+vL13Du0iLYANHnatm7h4F7fe0q0UFMoIig0KdFaQHpQRiSToSfd5OlUheD9ZXqwDJucaxTd770INIODFVEnH26jjK6+110zgF0xjwXNtHnrgA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600210933; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ZqSJckFwaigPqII7TYtgwKO5VF0wvwDzqsNfM47vfmM=; b=ncrClxZZjlre1ZoAPQruN44wq0qKgAMadMUlB4cLLT/giwmSi4NR0Yr2bZOuZyf0fXXjIdMDzqF9vfob3VLdO9Lc5FQYaQy1fTRPzmGlmGI6op/nwnvqi9ZcT6s/ct6MQybL+TN/I0YoHPzyf0HDi8Ix6jpGeGTXBaHoDswjpw0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1600210933602693.1199056661717; Tue, 15 Sep 2020 16:02:13 -0700 (PDT) Received: from localhost ([::1]:53386 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kIJxk-0007E4-D4 for importer@patchew.org; Tue, 15 Sep 2020 19:02:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59590) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kIJdk-0007Wm-83 for qemu-devel@nongnu.org; Tue, 15 Sep 2020 18:41:32 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:28970) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kIJdi-0002i8-7A for qemu-devel@nongnu.org; Tue, 15 Sep 2020 18:41:31 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-101-23JKPyhvNx2sP6y7bMV-5w-1; Tue, 15 Sep 2020 18:41:26 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F0720107B79B; Tue, 15 Sep 2020 22:41:18 +0000 (UTC) Received: from scv.redhat.com (ovpn-119-140.rdu2.redhat.com [10.10.119.140]) by smtp.corp.redhat.com (Postfix) with ESMTP id E384660BE5; Tue, 15 Sep 2020 22:41:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600209689; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZqSJckFwaigPqII7TYtgwKO5VF0wvwDzqsNfM47vfmM=; b=gWh48C/2/z/+d1BiRV1F+57C4iN+QnWX3igJE2XNWSgIz7fHp77p/6aRHHXOkZRwgKZHdF xBtYKTmQbVJLLEvaZE53W7dHtBy5MlHRWgl4XysP8lMotMYjGStqpgXQesId7sGBFTJHIS 9fZOpk7YqhH3z3GwcqI72JjUxucLLE4= X-MC-Unique: 23JKPyhvNx2sP6y7bMV-5w-1 From: John Snow To: qemu-devel@nongnu.org, Markus Armbruster Subject: [PATCH 30/37] qapi/introspect.py: Add a typed 'extra' structure Date: Tue, 15 Sep 2020 18:40:20 -0400 Message-Id: <20200915224027.2529813-31-jsnow@redhat.com> In-Reply-To: <20200915224027.2529813-1-jsnow@redhat.com> References: <20200915224027.2529813-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jsnow@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com 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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/15 02:10:32 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -50 X-Spam_score: -5.1 X-Spam_bar: ----- X-Spam_report: (-5.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.999, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: John Snow , Peter Maydell , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Eduardo Habkost , Cleber Rosa Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Typing arbitrarily shaped dicts with mypy is difficult prior to Python 3.8; using explicit structures is nicer. Since we always define an Extra type now, the return type of _make_tree simplifies and always returns the tuple. Signed-off-by: John Snow --- scripts/qapi/introspect.py | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/scripts/qapi/introspect.py b/scripts/qapi/introspect.py index b036fcf9ce..41ca8afc67 100644 --- a/scripts/qapi/introspect.py +++ b/scripts/qapi/introspect.py @@ -10,6 +10,8 @@ See the COPYING file in the top-level directory. """ =20 +from typing import (NamedTuple, Optional, Sequence) + from .common import ( c_name, gen_endif, @@ -21,16 +23,21 @@ QAPISchemaType) =20 =20 -def _make_tree(obj, ifcond, features, extra=3DNone): - if extra is None: - extra =3D {} - if ifcond: - extra['if'] =3D ifcond +class Extra(NamedTuple): + """ + Extra contains data that isn't intended for output by introspection. + """ + comment: Optional[str] =3D None + ifcond: Sequence[str] =3D tuple() + + +def _make_tree(obj, ifcond, features, + extra: Optional[Extra] =3D None): + comment =3D extra.comment if extra else None + extra =3D Extra(comment, ifcond) if features: - obj['features'] =3D [(f.name, {'if': f.ifcond}) for f in features] - if extra: - return (obj, extra) - return obj + obj['features'] =3D [(f.name, Extra(None, f.ifcond)) for f in feat= ures] + return (obj, extra) =20 =20 def _tree_to_qlit(obj, level=3D0, suppress_first_indent=3DFalse): @@ -40,8 +47,8 @@ def indent(level): =20 if isinstance(obj, tuple): ifobj, extra =3D obj - ifcond =3D extra.get('if') - comment =3D extra.get('comment') + ifcond =3D extra.ifcond + comment =3D extra.comment ret =3D '' if comment: ret +=3D indent(level) + '/* %s */\n' % comment @@ -168,7 +175,7 @@ def _gen_tree(self, name, mtype, obj, ifcond, features): if not self._unmask: # Output a comment to make it easy to map masked names # back to the source when reading the generated output. - extra =3D {'comment': '"%s" =3D %s' % (self._name(name), n= ame)} + extra =3D Extra(comment=3Df'"{self._name(name)}" =3D {name= }') name =3D self._name(name) obj['name'] =3D name obj['meta-type'] =3D mtype --=20 2.26.2