From nobody Tue Nov 18 19:47:56 2025 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=1612288380; cv=none; d=zohomail.com; s=zohoarc; b=FcjzJ827FTR5+gmEX7sPOYzfNDCilHX2y/HRkaqX87W+PVGjIVyXS/QTt+7xrqJMX7sc62ADy+QS8y186PEs0PXyjxRl1UwriRC6NAq9VxEIy4XH5QkFV+IOViaFBGgS/mz4BanzshoBYgyIKgxdsyLpvVid+yitb0RTyiuHyvo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612288380; 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=ldeAmiIKnAEFKCFQiHI4++OADpvPK+E3kx7sPHnd2IU=; b=Dksi4Jn8t5zHPidcS8TEvkS0sm7ENuCEsNE78Sr3ekMffWdP/9YvEgIPglkjzli7VW4Aet0Zhh6J43ulVCivDotLBfWRXsxyzpreZ/X9rdCSP20lt8VTOYV+RbgBHmsSvijtiWu2mFWDbcklCM4y6cTMTJ5okhQSd1w9BqwHST0= 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 1612288380823555.5473115518573; Tue, 2 Feb 2021 09:53:00 -0800 (PST) Received: from localhost ([::1]:59238 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l6zrH-0001ku-J3 for importer@patchew.org; Tue, 02 Feb 2021 12:52:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43838) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6zlY-0004n8-IT for qemu-devel@nongnu.org; Tue, 02 Feb 2021 12:47:04 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:43187) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l6zlW-0008BS-CA for qemu-devel@nongnu.org; Tue, 02 Feb 2021 12:47:04 -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-469-qyPyJnk5PRWBzudEnoRWLg-1; Tue, 02 Feb 2021 12:46:58 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C05DA1800D50; Tue, 2 Feb 2021 17:46:57 +0000 (UTC) Received: from scv.redhat.com (ovpn-112-247.rdu2.redhat.com [10.10.112.247]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0948E5C1CF; Tue, 2 Feb 2021 17:46:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612288021; 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=ldeAmiIKnAEFKCFQiHI4++OADpvPK+E3kx7sPHnd2IU=; b=X5hNOi3Wvq/JGt38d01KzMI3HcPhVARflTPk5sMtluzvtm0TPNYoPElsK+ZtEZ9jshadPY SQ03T50KQQB11ZzXiXG72Qc84PipJUCWF8hZ+Vtk4plGOIFu+a0QqZ/icqE346MLPp789g qGp9XPojtYjfdLUlvXYrvKx1s6NJuJI= X-MC-Unique: qyPyJnk5PRWBzudEnoRWLg-1 From: John Snow To: qemu-devel@nongnu.org, Markus Armbruster Subject: [PATCH v4 05/14] qapi/introspect.py: Unify return type of _make_tree() Date: Tue, 2 Feb 2021 12:46:42 -0500 Message-Id: <20210202174651.2274166-6-jsnow@redhat.com> In-Reply-To: <20210202174651.2274166-1-jsnow@redhat.com> References: <20210202174651.2274166-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jsnow@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=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.386, 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: Michael Roth , John Snow , 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" Returning two different types conditionally can be complicated to type. Return one type for consistency. Signed-off-by: John Snow --- scripts/qapi/introspect.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/qapi/introspect.py b/scripts/qapi/introspect.py index ccdf4f1c0d0..d3fbf694ad2 100644 --- a/scripts/qapi/introspect.py +++ b/scripts/qapi/introspect.py @@ -29,9 +29,7 @@ def _make_tree(obj, ifcond, extra=3DNone): extra =3D {} if ifcond: extra['if'] =3D ifcond - if extra: - return (obj, extra) - return obj + return (obj, extra) =20 =20 def _tree_to_qlit(obj, level=3D0, suppress_first_indent=3DFalse): --=20 2.29.2