From nobody Mon Feb 9 11:32:54 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=1623097396; cv=none; d=zohomail.com; s=zohoarc; b=CyZMvB0k5m7FTx7L0D6A0EFRgfuBfrJjuJy0Wahh+N8fdkTJNLb3A5QPQWi18NIYqEBaE8BbIzZnDwlcw3j9YsM7GCXEHwQzoq99+ymYKbcG0yA2Kcmi4i9Tiexy0wladCRrnNFcQLJqBVJbIg6UjXBkwTZoVbPJWgrvQXnggQA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623097396; 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=f7z4slaRs6UmoJ1JXsZshdZkQIHhnb0hvpgKg0Fce+w=; b=nFtvE5xXBHCO9BFEK+aImqxKR0S32JOqUjyQI2tx4pk5PWn1Msnaa5ESXk4T9CGstGZaFD4oT6sKVCIuQAlX5hfGlpE+RGHp5KKRPSZ0F2EYx5XGCCyYsofvaRlUTMfvouJupaR/pM4RRls3M5x4oY88kp/IaueIidMlVDezcd8= 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 1623097396168352.7468114727112; Mon, 7 Jun 2021 13:23:16 -0700 (PDT) Received: from localhost ([::1]:58440 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lqLmF-0004K1-4N for importer@patchew.org; Mon, 07 Jun 2021 16:23:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37698) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqLX2-0004G7-Cn for qemu-devel@nongnu.org; Mon, 07 Jun 2021 16:07:32 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:51602) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqLWy-0006WZ-13 for qemu-devel@nongnu.org; Mon, 07 Jun 2021 16:07: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-389-MT9dcRzCMT-HHz_lqpDZOg-1; Mon, 07 Jun 2021 16:07:24 -0400 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 25F1B107B466; Mon, 7 Jun 2021 20:07:09 +0000 (UTC) Received: from scv.redhat.com (ovpn-116-137.rdu2.redhat.com [10.10.116.137]) by smtp.corp.redhat.com (Postfix) with ESMTP id CE9435C1C2; Mon, 7 Jun 2021 20:07:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623096445; 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=f7z4slaRs6UmoJ1JXsZshdZkQIHhnb0hvpgKg0Fce+w=; b=NbZw/cr9025MAzWT1RxY8wAj9R+eBmj0WHsaloCBhft+xoR3//6JKYQxJm4kPEYcY5yO15 mUytjNT1OUDBMDvCt/jda+gBqBV11SjgshWo3hQcEz4kHR62EdUN2xbFp7nZ7VPJrD4gKK 8hgST8xA/4n+garT/JzH7wR/ZRdveU0= X-MC-Unique: MT9dcRzCMT-HHz_lqpDZOg-1 From: John Snow To: qemu-devel@nongnu.org Subject: [PATCH 16/42] scripts/qmp-shell: use isinstance() instead of type() Date: Mon, 7 Jun 2021 16:06:23 -0400 Message-Id: <20210607200649.1840382-17-jsnow@redhat.com> In-Reply-To: <20210607200649.1840382-1-jsnow@redhat.com> References: <20210607200649.1840382-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: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.2, 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_H4=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: "Niteesh G . S ." , Cleber Rosa , John Snow , Markus Armbruster , Eduardo Habkost 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" A bit more idiomatic, and quiets some linter warnings. Signed-off-by: John Snow --- scripts/qmp/qmp-shell | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/qmp/qmp-shell b/scripts/qmp/qmp-shell index bf7a49dfc1..970f43dd00 100755 --- a/scripts/qmp/qmp-shell +++ b/scripts/qmp/qmp-shell @@ -195,13 +195,13 @@ class QMPShell(qmp.QEMUMonitorProtocol): for path in optpath[:-1]: curpath.append(path) obj =3D parent.get(path, {}) - if type(obj) is not dict: + if not isinstance(obj, dict): msg =3D 'Cannot use "{:s}" as both leaf and non-leaf k= ey' raise QMPShellError(msg.format('.'.join(curpath))) parent[path] =3D obj parent =3D obj if optpath[-1] in parent: - if type(parent[optpath[-1]]) is dict: + if isinstance(parent[optpath[-1]], dict): msg =3D 'Cannot use "{:s}" as both leaf and non-leaf k= ey' raise QMPShellError(msg.format('.'.join(curpath))) raise QMPShellError(f'Cannot set "{key}" multiple times') --=20 2.31.1