From nobody Sun May 5 22:12:50 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 152957025843560.069804414187956; Thu, 21 Jun 2018 01:37:38 -0700 (PDT) Received: from localhost ([::1]:53797 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVv5p-0007Nm-4z for importer@patchew.org; Thu, 21 Jun 2018 04:37:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55549) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVv4Q-0006m2-2g for qemu-devel@nongnu.org; Thu, 21 Jun 2018 04:35:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fVv4L-0002Li-2B for qemu-devel@nongnu.org; Thu, 21 Jun 2018 04:35:58 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:40558 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fVv4K-0002L1-TF for qemu-devel@nongnu.org; Thu, 21 Jun 2018 04:35:53 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7109B8011059; Thu, 21 Jun 2018 08:35:52 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-117-237.ams2.redhat.com [10.36.117.237]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4BA3A2026D6B; Thu, 21 Jun 2018 08:35:52 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 2649E1138645; Thu, 21 Jun 2018 10:35:51 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Thu, 21 Jun 2018 10:35:51 +0200 Message-Id: <20180621083551.775-1-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Thu, 21 Jun 2018 08:35:52 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Thu, 21 Jun 2018 08:35:52 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'armbru@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH] qapi: Fix some pycodestyle-3 complaints X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mdroth@linux.vnet.ibm.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Fix the following issues: common.py:873:13: E129 visually indented line with same indent as next = logical line common.py:1766:5: E741 ambiguous variable name 'l' common.py:1784:1: E305 expected 2 blank lines after class or function d= efinition, found 1 common.py:1833:1: E305 expected 2 blank lines after class or function d= efinition, found 1 common.py:1843:1: E305 expected 2 blank lines after class or function d= efinition, found 1 visit.py:181:18: E127 continuation line over-indented for visual indent Signed-off-by: Markus Armbruster Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- scripts/qapi/common.py | 15 +++++++++------ scripts/qapi/visit.py | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/scripts/qapi/common.py b/scripts/qapi/common.py index 2462fc0291..e51767d44d 100644 --- a/scripts/qapi/common.py +++ b/scripts/qapi/common.py @@ -865,12 +865,12 @@ def check_keys(expr_elem, meta, required, optional=3D= []): if key not in required and key not in optional: raise QAPISemError(info, "Unknown key '%s' in %s '%s'" % (key, meta, name)) - if (key =3D=3D 'gen' or key =3D=3D 'success-response') and value i= s not False: + if key in ['gen', 'success-response'] and value is not False: raise QAPISemError(info, "'%s' of %s '%s' should only use false valu= e" % (key, meta, name)) - if (key =3D=3D 'boxed' or key =3D=3D 'allow-oob' or - key =3D=3D 'allow-preconfig') and value is not True: + if (key in ['boxed', 'allow-oob', 'allow-preconfig'] + and value is not True): raise QAPISemError(info, "'%s' of %s '%s' should only use true value" % (key, meta, name)) @@ -1763,12 +1763,12 @@ def camel_to_upper(value): return c_fun_str =20 new_name =3D '' - l =3D len(c_fun_str) - for i in range(l): + length =3D len(c_fun_str) + for i in range(length): c =3D c_fun_str[i] # When c is upper and no '_' appears before, do more checks if c.isupper() and (i > 0) and c_fun_str[i - 1] !=3D '_': - if i < l - 1 and c_fun_str[i + 1].islower(): + if i < length - 1 and c_fun_str[i + 1].islower(): new_name +=3D '_' elif c_fun_str[i - 1].isdigit(): new_name +=3D '_' @@ -1781,6 +1781,7 @@ def c_enum_const(type_name, const_name, prefix=3DNone= ): type_name =3D prefix return camel_to_upper(type_name) + '_' + c_name(const_name, False).upp= er() =20 + if hasattr(str, 'maketrans'): c_name_trans =3D str.maketrans('.-', '__') else: @@ -1830,6 +1831,7 @@ def c_name(name, protect=3DTrue): return 'q_' + name return name =20 + eatspace =3D '\033EATSPACE.' pointer_suffix =3D ' *' + eatspace =20 @@ -1840,6 +1842,7 @@ def genindent(count): ret +=3D ' ' return ret =20 + indent_level =3D 0 =20 =20 diff --git a/scripts/qapi/visit.py b/scripts/qapi/visit.py index 5d72d8936c..1827c2a094 100644 --- a/scripts/qapi/visit.py +++ b/scripts/qapi/visit.py @@ -178,7 +178,7 @@ void visit_type_%(c_name)s(Visitor *v, const char *name= , %(c_name)s **obj, Error } switch ((*obj)->type) { ''', - c_name=3Dc_name(name)) + c_name=3Dc_name(name)) =20 for var in variants.variants: ret +=3D mcgen(''' --=20 2.17.1