From nobody Mon Feb 9 21:22:07 2026 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=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1613737543; cv=none; d=zohomail.com; s=zohoarc; b=hqT9qMMLyt4Ofj0aPe3wUCHXQK8lhMgCwKgtEKVk8y3LNb3fVlyEXEM2CPK5tQZePAnyr4cbGWFS8nwJ3gImkpyPDLSvzko/XTKQlbLHpVHZYXjV3bxQalMOzbvkczaRbeFQwhWVa2Y+ItXJkjb10ck1wZUGPxbFF09MrI71NRM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613737543; 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=ZDOw0v4yn2If0p2owCe2ulgBcUI/rKXU1MjkJJdqMbI=; b=G6ssCHxrVVDXGDR7a/jHAWE0ft/3jeLe9o4wGAfgN8eZgrsOIqgA+B3d0uFruecRA+fyhZwcv0aCSsIAxXfer/2rBGS37KHLV+gyVoi725nSEvLui4uURPfqbsS/ut7lUP64AYIL5GIsjlqALmxqdCd9oirHYwLkBQ5JybXXc/k= 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=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 1613737542889559.4359996798373; Fri, 19 Feb 2021 04:25:42 -0800 (PST) Received: from localhost ([::1]:53926 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lD4qr-0005U0-NG for importer@patchew.org; Fri, 19 Feb 2021 07:25:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53100) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lD4WW-0007Rt-Jl for qemu-devel@nongnu.org; Fri, 19 Feb 2021 07:04:40 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:39824) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lD4WO-00020h-BH for qemu-devel@nongnu.org; Fri, 19 Feb 2021 07:04:40 -0500 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-275-tHmgG-YKOpKqqYrcTz0Yfw-1; Fri, 19 Feb 2021 07:04:29 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 03C4EC293; Fri, 19 Feb 2021 12:04:28 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-115-79.ams2.redhat.com [10.36.115.79]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C8EF25D6AD; Fri, 19 Feb 2021 12:04:27 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 3CB48112F00D; Fri, 19 Feb 2021 13:04:23 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613736271; 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=ZDOw0v4yn2If0p2owCe2ulgBcUI/rKXU1MjkJJdqMbI=; b=FfQX1td6KudLC5j/8rYr3wDnQ5D57E+o7qqhBjqOE6mrBwqX8tQtYzsdPmG3m2Fk0x+NmK 8SkO8sDTLA0JgDGvmfIfg1BaJG4mpwQXpx124UY9kozpEJhlnq3oZgGjKF8SLqpLGeSDwz Md1589by30dAzzk6P/JFMkfmhCaVbpM= X-MC-Unique: tHmgG-YKOpKqqYrcTz0Yfw-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 17/18] qapi/introspect.py: Type _gen_tree variants as Sequence[str] Date: Fri, 19 Feb 2021 13:04:21 +0100 Message-Id: <20210219120422.600850-18-armbru@redhat.com> In-Reply-To: <20210219120422.600850-1-armbru@redhat.com> References: <20210219120422.600850-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 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=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=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: peter.maydell@linaro.org, John Snow Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: John Snow Optional[List] is clunky; an empty sequence can more elegantly convey "no variants". By downgrading "List" to "Sequence", we can also accept tuples; this is useful for the empty tuple specifically, which we may use as a default parameter because it is immutable. Signed-off-by: John Snow Message-Id: <20210216021809.134886-18-jsnow@redhat.com> Reviewed-by: Markus Armbruster [Doc string touched up] Reviewed-by: Markus Armbruster --- scripts/qapi/introspect.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/qapi/introspect.py b/scripts/qapi/introspect.py index e770c9432b..d0b0fd19ed 100644 --- a/scripts/qapi/introspect.py +++ b/scripts/qapi/introspect.py @@ -249,13 +249,13 @@ def _use_type(self, typ: QAPISchemaType) -> str: return self._name(typ.name) =20 @staticmethod - def _gen_features(features: List[QAPISchemaFeature] + def _gen_features(features: Sequence[QAPISchemaFeature] ) -> List[Annotated[str]]: return [Annotated(f.name, f.ifcond) for f in features] =20 def _gen_tree(self, name: str, mtype: str, obj: Dict[str, object], ifcond: Sequence[str], - features: Optional[List[QAPISchemaFeature]]) -> None: + features: Sequence[QAPISchemaFeature] =3D ()) -> None: """ Build and append a SchemaInfo object to self._trees. =20 @@ -302,7 +302,7 @@ def _gen_variant(self, variant: QAPISchemaVariant =20 def visit_builtin_type(self, name: str, info: Optional[QAPISourceInfo], json_type: str) -> None: - self._gen_tree(name, 'builtin', {'json-type': json_type}, [], None) + self._gen_tree(name, 'builtin', {'json-type': json_type}, []) =20 def visit_enum_type(self, name: str, info: Optional[QAPISourceInfo], ifcond: Sequence[str], @@ -320,7 +320,7 @@ def visit_array_type(self, name: str, info: Optional[QA= PISourceInfo], element_type: QAPISchemaType) -> None: element =3D self._use_type(element_type) self._gen_tree('[' + element + ']', 'array', {'element-type': elem= ent}, - ifcond, None) + ifcond) =20 def visit_object_type_flat(self, name: str, info: Optional[QAPISourceI= nfo], ifcond: Sequence[str], --=20 2.26.2