From nobody Sun Nov 16 23:02:12 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=1601929003; cv=none; d=zohomail.com; s=zohoarc; b=Wl1mvmGv9Nj2XOiseE1cuXXsyJhh5wPFSyqwfOeO5PQsOVeRloa0BfBb/fBEKUGZVdaYNHXKHIKF3qV009Qdc2lAui62Vzy0K8WtcQ/5WQqr8C2Am6Q+2URjjZZpgKHyHIQAJnr1OFnWyQE4qZ/c7UyffHKUEP1Avk+ebF8MqPg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601929003; 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=t/abyknJ077SLyyiLDe4jq6y7p12uzRjz9MkvLvt3Og=; b=M0Dv1GCw35iVF4+K9UhWWEL1yzdGHimue00nGO/zfj9V2shAXuZXjd2RXr1Dj/tYM4q4JHiFIUKkO19AphVUYK0B7BPJfiLMnSMbzDaqaOlf+0R3Txqk9yhoqmDsdaZ4NV6Wf9StNoim5v9nsBIEfmJp/dUi2HtTXONBfM4qNe8= 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 16019290036621004.5177571439946; Mon, 5 Oct 2020 13:16:43 -0700 (PDT) Received: from localhost ([::1]:54850 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kPWuY-0008C6-8w for importer@patchew.org; Mon, 05 Oct 2020 16:16:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57184) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kPWXe-0001ca-Ky for qemu-devel@nongnu.org; Mon, 05 Oct 2020 15:53:02 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:34693) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kPWXc-0007Ee-Pd for qemu-devel@nongnu.org; Mon, 05 Oct 2020 15:53:02 -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-146-hbN3PjApNye3vKfjOFYXVg-1; Mon, 05 Oct 2020 15:52:46 -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 337FA8030D0 for ; Mon, 5 Oct 2020 19:52:45 +0000 (UTC) Received: from scv.redhat.com (ovpn-120-38.rdu2.redhat.com [10.10.120.38]) by smtp.corp.redhat.com (Postfix) with ESMTP id 359D75C1BD; Mon, 5 Oct 2020 19:52:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601927580; 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=t/abyknJ077SLyyiLDe4jq6y7p12uzRjz9MkvLvt3Og=; b=STKN5UVwmAL5bZsmPdqDl5DZPvot8lnky77pCmZuQb+c4soGwd+oSJV7Z9aviwja3EY30Q 99Uy18+HVqdze4SHRN3Yn7gCZKWT8/MDsoJt2jBKvqRyKJXWQlRb96EYag0JjyCmFlijBF TSMplBaYWAweDjdYThVmBPrnLAVDRqI= X-MC-Unique: hbN3PjApNye3vKfjOFYXVg-1 From: John Snow To: qemu-devel@nongnu.org Subject: [PATCH v5 33/36] qapi/types.py: remove one-letter variables Date: Mon, 5 Oct 2020 15:51:55 -0400 Message-Id: <20201005195158.2348217-34-jsnow@redhat.com> In-Reply-To: <20201005195158.2348217-1-jsnow@redhat.com> References: <20201005195158.2348217-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=63.128.21.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/05 01:25:11 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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.733, 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: Cleber Rosa , John Snow , Eduardo Habkost , Markus Armbruster 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" "John, if pylint told you to jump off a bridge, would you?" Hey, if it looked like fun, I might. Now that this file is clean, enable pylint checks on this file. Signed-off-by: John Snow Reviewed-by: Eduardo Habkost Reviewed-by: Cleber Rosa --- scripts/qapi/pylintrc | 1 - scripts/qapi/types.py | 29 +++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/scripts/qapi/pylintrc b/scripts/qapi/pylintrc index 8badcb11cda..b3c4cf46dbf 100644 --- a/scripts/qapi/pylintrc +++ b/scripts/qapi/pylintrc @@ -6,7 +6,6 @@ ignore-patterns=3Derror.py, expr.py, parser.py, schema.py, - types.py, visit.py, =20 =20 diff --git a/scripts/qapi/types.py b/scripts/qapi/types.py index 766822feb3a..9d1e79d503d 100644 --- a/scripts/qapi/types.py +++ b/scripts/qapi/types.py @@ -49,14 +49,14 @@ def gen_enum_lookup(name: str, .array =3D (const char *const[]) { ''', c_name=3Dc_name(name)) - for m in members: - ret +=3D gen_if(m.ifcond) - index =3D c_enum_const(name, m.name, prefix) + for member in members: + ret +=3D gen_if(member.ifcond) + index =3D c_enum_const(name, member.name, prefix) ret +=3D mcgen(''' [%(index)s] =3D "%(name)s", ''', - index=3Dindex, name=3Dm.name) - ret +=3D gen_endif(m.ifcond) + index=3Dindex, name=3Dmember.name) + ret +=3D gen_endif(member.ifcond) =20 ret +=3D mcgen(''' }, @@ -79,13 +79,13 @@ def gen_enum(name: str, ''', c_name=3Dc_name(name)) =20 - for m in enum_members: - ret +=3D gen_if(m.ifcond) + for member in enum_members: + ret +=3D gen_if(member.ifcond) ret +=3D mcgen(''' %(c_enum)s, ''', - c_enum=3Dc_enum_const(name, m.name, prefix)) - ret +=3D gen_endif(m.ifcond) + c_enum=3Dc_enum_const(name, member.name, prefix)) + ret +=3D gen_endif(member.ifcond) =20 ret +=3D mcgen(''' } %(c_name)s; @@ -148,11 +148,12 @@ def gen_object(name: str, ifcond: List[str], objects_seen.add(name) =20 ret =3D '' - if variants: - for v in variants.variants: - if isinstance(v.type, QAPISchemaObjectType): - ret +=3D gen_object(v.type.name, v.type.ifcond, v.type.bas= e, - v.type.local_members, v.type.variants) + for variant in variants.variants if variants else (): + obj =3D variant.type + if not isinstance(obj, QAPISchemaObjectType): + continue + ret +=3D gen_object(obj.name, obj.ifcond, obj.base, + obj.local_members, obj.variants) =20 ret +=3D mcgen(''' =20 --=20 2.26.2