From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DAFC9C4363C for ; Wed, 7 Oct 2020 08:20:22 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 361A32083B for ; Wed, 7 Oct 2020 08:20:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="BWg8xns8" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 361A32083B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:39874 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kQ4gP-0003LH-83 for qemu-devel@archiver.kernel.org; Wed, 07 Oct 2020 04:20:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44764) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kQ4fG-0002DU-0R for qemu-devel@nongnu.org; Wed, 07 Oct 2020 04:19:10 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:47422) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kQ4fE-000839-3a for qemu-devel@nongnu.org; Wed, 07 Oct 2020 04:19:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602058747; 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: in-reply-to:in-reply-to:references:references; bh=BZRLLFG6tdPimUzxw+QwdO80QGyYlVxwOyx1cV1Tquw=; b=BWg8xns8Sfc0XN/07kE6lfNPgD16/CMDfvK1inWqpW3F1QdfvatN/kY69EThtXy7tJ/1SK XQBK4I6Cg0JV4KgEbyX9n2pSEWT8V8lNhf4c2A2HlLJiFGiqdqjOadMFkbJjnTGngl0uhI qTdPhMuJniBo8C9wx7/G3y/OQ37suQA= 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-23-W0JomLHENju1ggHpdicngQ-1; Wed, 07 Oct 2020 04:19:05 -0400 X-MC-Unique: W0JomLHENju1ggHpdicngQ-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 77E4D10866A8 for ; Wed, 7 Oct 2020 08:19:04 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-182.ams2.redhat.com [10.36.112.182]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1FBFC1002C27; Wed, 7 Oct 2020 08:19:04 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 9E1E111329C1; Wed, 7 Oct 2020 10:19:02 +0200 (CEST) From: Markus Armbruster To: John Snow Subject: Re: [PATCH v5 08/36] qapi: delint using flake8 References: <20201005195158.2348217-1-jsnow@redhat.com> <20201005195158.2348217-9-jsnow@redhat.com> Date: Wed, 07 Oct 2020 10:19:02 +0200 In-Reply-To: <20201005195158.2348217-9-jsnow@redhat.com> (John Snow's message of "Mon, 5 Oct 2020 15:51:30 -0400") Message-ID: <87imbmih3d.fsf@dusky.pond.sub.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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-Type: text/plain Received-SPF: pass client-ip=216.205.24.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/07 00:54:30 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_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: Markus Armbruster , qemu-devel@nongnu.org, Eduardo Habkost , Cleber Rosa Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" John Snow writes: > Petty style guide fixes and line length enforcement. Not a big win, not > a big loss, but flake8 passes 100% on the qapi module, which gives us an > easy baseline to enforce hereafter. > > A note on the flake8 exception: flake8 will warn on *any* bare except, > but pylint's is context-aware and will suppress the warning if you > re-raise the exception. > > Signed-off-by: John Snow > Reviewed-by: Eduardo Habkost > Reviewed-by: Cleber Rosa > --- > scripts/qapi/.flake8 | 2 ++ > scripts/qapi/commands.py | 3 ++- > scripts/qapi/schema.py | 8 +++++--- > scripts/qapi/visit.py | 16 +++++++++++----- > 4 files changed, 20 insertions(+), 9 deletions(-) > create mode 100644 scripts/qapi/.flake8 > > diff --git a/scripts/qapi/.flake8 b/scripts/qapi/.flake8 > new file mode 100644 > index 00000000000..6b158c68b84 > --- /dev/null > +++ b/scripts/qapi/.flake8 > @@ -0,0 +1,2 @@ > +[flake8] > +extend-ignore = E722 # Prefer pylint's bare-except checks to flake8's > diff --git a/scripts/qapi/commands.py b/scripts/qapi/commands.py > index 64ed5278f93..5dc2f5a9fa8 100644 > --- a/scripts/qapi/commands.py > +++ b/scripts/qapi/commands.py > @@ -65,7 +65,8 @@ def gen_call(name, arg_type, boxed, ret_type): > def gen_marshal_output(ret_type): > return mcgen(''' > > -static void qmp_marshal_output_%(c_name)s(%(c_type)s ret_in, QObject **ret_out, Error **errp) > +static void qmp_marshal_output_%(c_name)s(%(c_type)s ret_in, > + QObject **ret_out, Error **errp) > { > Visitor *v; > > diff --git a/scripts/qapi/schema.py b/scripts/qapi/schema.py > index 093f7a38d88..cfc52e1ae44 100644 > --- a/scripts/qapi/schema.py > +++ b/scripts/qapi/schema.py > @@ -536,7 +536,7 @@ def set_defined_in(self, name): > v.set_defined_in(name) > > def check(self, schema, seen): > - if not self.tag_member: # flat union > + if not self.tag_member: # flat union > self.tag_member = seen.get(c_name(self._tag_name)) > base = "'base'" > # Pointing to the base type when not implicit would be > @@ -821,7 +821,7 @@ def __init__(self, fname): > self._entity_dict = {} > self._module_dict = OrderedDict() > self._schema_dir = os.path.dirname(fname) > - self._make_module(None) # built-ins > + self._make_module(None) # built-ins > self._make_module(fname) > self._predefining = True > self._def_predefineds() > @@ -965,7 +965,9 @@ def _make_implicit_object_type(self, name, info, ifcond, role, members): > # But it's not tight: the disjunction need not imply it. We > # may end up compiling useless wrapper types. > # TODO kill simple unions or implement the disjunction > - assert (ifcond or []) == typ._ifcond # pylint: disable=protected-access > + > + # pylint: disable=protected-access > + assert (ifcond or []) == typ._ifcond > else: > self._def_entity(QAPISchemaObjectType( > name, info, None, ifcond, None, None, members, None)) > diff --git a/scripts/qapi/visit.py b/scripts/qapi/visit.py > index ea277e7704b..808410d6f1b 100644 > --- a/scripts/qapi/visit.py > +++ b/scripts/qapi/visit.py > @@ -31,7 +31,9 @@ def gen_visit_decl(name, scalar=False): > if not scalar: > c_type += '*' > return mcgen(''' > -bool visit_type_%(c_name)s(Visitor *v, const char *name, %(c_type)sobj, Error **errp); > + > +bool visit_type_%(c_name)s(Visitor *v, const char *name, > + %(c_type)sobj, Error **errp); > ''', > c_name=c_name(name), c_type=c_type) > > @@ -125,7 +127,8 @@ def gen_visit_object_members(name, base, members, variants): > def gen_visit_list(name, element_type): > return mcgen(''' > > -bool visit_type_%(c_name)s(Visitor *v, const char *name, %(c_name)s **obj, Error **errp) > +bool visit_type_%(c_name)s(Visitor *v, const char *name, > + %(c_name)s **obj, Error **errp) > { > bool ok = false; > %(c_name)s *tail; > @@ -158,7 +161,8 @@ def gen_visit_list(name, element_type): > def gen_visit_enum(name): > return mcgen(''' > > -bool visit_type_%(c_name)s(Visitor *v, const char *name, %(c_name)s *obj, Error **errp) > +bool visit_type_%(c_name)s(Visitor *v, const char *name, > + %(c_name)s *obj, Error **errp) > { > int value = *obj; > bool ok = visit_type_enum(v, name, &value, &%(c_name)s_lookup, errp); > @@ -172,7 +176,8 @@ def gen_visit_enum(name): > def gen_visit_alternate(name, variants): > ret = mcgen(''' > > -bool visit_type_%(c_name)s(Visitor *v, const char *name, %(c_name)s **obj, Error **errp) > +bool visit_type_%(c_name)s > + (Visitor *v, const char *name, %(c_name)s **obj, Error **errp) Please break this line the same way as the ones above: bool visit_type_%(c_name)s(Visitor *v, const char *name, %(c_name)s **obj, Error **errp) > { > bool ok = false; > > @@ -247,7 +252,8 @@ def gen_visit_alternate(name, variants): > def gen_visit_object(name, base, members, variants): > return mcgen(''' > > -bool visit_type_%(c_name)s(Visitor *v, const char *name, %(c_name)s **obj, Error **errp) > +bool visit_type_%(c_name)s > + (Visitor *v, const char *name, %(c_name)s **obj, Error **errp) > { > bool ok = false; Likewise.