From nobody Tue Feb 10 20:48:03 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1697470064; cv=none; d=zohomail.com; s=zohoarc; b=dMbYH1Hn6U3/K1NkBQSkH5HhZwkCPhm32xE4q3hIF1w85bm9NSDyybvixLBpdIQtGPGHRb5jn5BoXGfC1nJ4WXv/+WM6bowyJ4eVugMVZff8MrQq4a0m4GH1D6LpYiZL6x38ZZgyR0WmrXuisZ8uqvrdfI5hh/tpUbq+98a54oM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1697470064; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=6Nh+Hgzz6TwYSV/cRzWHk1PKRYK1opIAdVs73vT5Crg=; b=L1BTrZdL21n3y46Ho/yIthS+Pwank7EDc1T3tWzLl5WYsL5oSY042Met5oLtW/x8O2ltlDxY0Rax+mnYhz9Qq4Y7fsF3ZR0jjEmS4UTFQlkEIwFYaTytviDNw6MniocGuMGD//EOUOi1+mctEyWPLLDTOiemgBR/dvk1u10Pe0g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1697470064414830.4688847243638; Mon, 16 Oct 2023 08:27:44 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qsPV9-0001QJ-QL; Mon, 16 Oct 2023 11:27:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qsPV7-0001Q1-QL for qemu-devel@nongnu.org; Mon, 16 Oct 2023 11:27:25 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qsPV6-0003OU-5S for qemu-devel@nongnu.org; Mon, 16 Oct 2023 11:27:25 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-659-5LkYgF8PPS6eJvyHwlgWxw-1; Mon, 16 Oct 2023 11:27:11 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A930A1023111 for ; Mon, 16 Oct 2023 15:27:10 +0000 (UTC) Received: from tapioca.redhat.com (unknown [10.45.225.170]) by smtp.corp.redhat.com (Postfix) with ESMTP id 308CD20296DB; Mon, 16 Oct 2023 15:27:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697470042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6Nh+Hgzz6TwYSV/cRzWHk1PKRYK1opIAdVs73vT5Crg=; b=VO2N3jPgMtlKV3hmMSN06o+l9grqy8bXFK4k/sUHHuusaD6SD76zRD+8Gb66wpRy27mE/g QffNYIgjYPlMM8B1na6xEUb8zM6Fojb1yXzKJYT1B3STCIfQDziAH0+lkqChtB/GahSGz5 42fqp8MBPm2U1poNwp/P49VR4jSdudk= X-MC-Unique: 5LkYgF8PPS6eJvyHwlgWxw-1 From: Victor Toso To: qemu-devel@nongnu.org Cc: Markus Armbruster , John Snow , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Andrea Bolognani Subject: [PATCH v2 02/11] scripts: qapi: black format main.py Date: Mon, 16 Oct 2023 17:26:55 +0200 Message-ID: <20231016152704.221611-3-victortoso@redhat.com> In-Reply-To: <20231016152704.221611-1-victortoso@redhat.com> References: <20231016152704.221611-1-victortoso@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 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=170.10.129.124; envelope-from=victortoso@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1697470065279100005 Content-Type: text/plain; charset="utf-8" flake8 complained: ./main.py:60:1: E302 expected 2 blank lines, found 1 Which is simple enough. My vim has black [0] enabled by default, so it did some extra formatting. I'm proposing to follow it. [0] https://black.readthedocs.io/en/stable/ Signed-off-by: Victor Toso --- scripts/qapi/main.py | 76 ++++++++++++++++++++++++++++---------------- 1 file changed, 48 insertions(+), 28 deletions(-) diff --git a/scripts/qapi/main.py b/scripts/qapi/main.py index 316736b6a2..fe65c1a17a 100644 --- a/scripts/qapi/main.py +++ b/scripts/qapi/main.py @@ -22,18 +22,20 @@ =20 =20 def invalid_prefix_char(prefix: str) -> Optional[str]: - match =3D must_match(r'([A-Za-z_.-][A-Za-z0-9_.-]*)?', prefix) + match =3D must_match(r"([A-Za-z_.-][A-Za-z0-9_.-]*)?", prefix) if match.end() !=3D len(prefix): return prefix[match.end()] return None =20 =20 -def generate(schema_file: str, - output_dir: str, - prefix: str, - unmask: bool =3D False, - builtins: bool =3D False, - gen_tracing: bool =3D False) -> None: +def generate( + schema_file: str, + output_dir: str, + prefix: str, + unmask: bool =3D False, + builtins: bool =3D False, + gen_tracing: bool =3D False, +) -> None: """ Generate C code for the given schema into the target directory. =20 @@ -63,25 +65,41 @@ def main() -> int: :return: int, 0 on success, 1 on failure. """ parser =3D argparse.ArgumentParser( - description=3D'Generate code from a QAPI schema') - parser.add_argument('-b', '--builtins', action=3D'store_true', - help=3D"generate code for built-in types") - parser.add_argument('-o', '--output-dir', action=3D'store', - default=3D'', - help=3D"write output to directory OUTPUT_DIR") - parser.add_argument('-p', '--prefix', action=3D'store', - default=3D'', - help=3D"prefix for symbols") - parser.add_argument('-u', '--unmask-non-abi-names', action=3D'store_tr= ue', - dest=3D'unmask', - help=3D"expose non-ABI names in introspection") + description=3D"Generate code from a QAPI schema" + ) + parser.add_argument( + "-b", + "--builtins", + action=3D"store_true", + help=3D"generate code for built-in types", + ) + parser.add_argument( + "-o", + "--output-dir", + action=3D"store", + default=3D"", + help=3D"write output to directory OUTPUT_DIR", + ) + parser.add_argument( + "-p", "--prefix", action=3D"store", default=3D"", help=3D"prefix f= or symbols" + ) + parser.add_argument( + "-u", + "--unmask-non-abi-names", + action=3D"store_true", + dest=3D"unmask", + help=3D"expose non-ABI names in introspection", + ) =20 # Option --suppress-tracing exists so we can avoid solving build system # problems. TODO Drop it when we no longer need it. - parser.add_argument('--suppress-tracing', action=3D'store_true', - help=3D"suppress adding trace events to qmp marsha= ls") + parser.add_argument( + "--suppress-tracing", + action=3D"store_true", + help=3D"suppress adding trace events to qmp marshals", + ) =20 - parser.add_argument('schema', action=3D'store') + parser.add_argument("schema", action=3D"store") args =3D parser.parse_args() =20 funny_char =3D invalid_prefix_char(args.prefix) @@ -91,12 +109,14 @@ def main() -> int: return 1 =20 try: - generate(args.schema, - output_dir=3Dargs.output_dir, - prefix=3Dargs.prefix, - unmask=3Dargs.unmask, - builtins=3Dargs.builtins, - gen_tracing=3Dnot args.suppress_tracing) + generate( + args.schema, + output_dir=3Dargs.output_dir, + prefix=3Dargs.prefix, + unmask=3Dargs.unmask, + builtins=3Dargs.builtins, + gen_tracing=3Dnot args.suppress_tracing, + ) except QAPIError as err: print(err, file=3Dsys.stderr) return 1 --=20 2.41.0