From nobody Mon Feb 9 19:53:39 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=1601441657; cv=none; d=zohomail.com; s=zohoarc; b=d0/v18DZ431ot8AAVH85KcmyX7vA8GsCc8MTSzzr47AXY0ZNl2gGfMjy2J+heudXmELIezvX2y8GytTf6r8wbSK6Rh4/0ZcdeqlvHJOeBqbggh3H1bsrL/i7Ktw0sVEM+FzuGCFdtSr5922EaTAH2YE4vkijQX27dQm2mDLk4dU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601441657; 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=zsrbijWdWkaRzekms+gJcLAAmCdepsipaOHNNwqcXTA=; b=IJcigInfaNhJ3CaremMLwY5ui1gdVAMbA2R9Y1z7M5wdTgMtfv9/HP64ffLk2ONzfauY/F3fOeAxKlrlh/iKScCKkxguOjYTpQVe8R9bI/lD8n8X1+ya7pmV0n4ThOvClXnWYPoIvXimDMqB9d9Octz9jcVsvHZIHEn2gYjr6ww= 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 1601441657206537.4396190414213; Tue, 29 Sep 2020 21:54:17 -0700 (PDT) Received: from localhost ([::1]:37430 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNU87-0003Yp-Uf for importer@patchew.org; Wed, 30 Sep 2020 00:54:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37050) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNTnG-0001CK-7y for qemu-devel@nongnu.org; Wed, 30 Sep 2020 00:32:42 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:43873) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kNTnD-0000ZY-Es for qemu-devel@nongnu.org; Wed, 30 Sep 2020 00:32:40 -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-563-M-rP3d6SP0CNMxhvhP0XJg-1; Wed, 30 Sep 2020 00:32:35 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 92D4D1074654; Wed, 30 Sep 2020 04:32:34 +0000 (UTC) Received: from scv.redhat.com (ovpn-119-140.rdu2.redhat.com [10.10.119.140]) by smtp.corp.redhat.com (Postfix) with ESMTP id 62EFA73678; Wed, 30 Sep 2020 04:32:33 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601440358; 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=zsrbijWdWkaRzekms+gJcLAAmCdepsipaOHNNwqcXTA=; b=ROP/qOZRPfrYJ+4LhyPYNUAa8jkQ9AH+AELDyeYP1epYcmLH+ZLs+yOlv2Xtg+MVxn5cY4 tPPSYij40EdmrK6IrhoDsw4QNLBW5I427YusTsBBh0crfJa2jm43J/wq44J9BcXM7z0IpK IfvOdKWjO3KruCRn0jEmYRWr0fhAZfc= X-MC-Unique: M-rP3d6SP0CNMxhvhP0XJg-1 From: John Snow To: qemu-devel@nongnu.org Subject: [PATCH v4 19/46] qapi/common.py: add type hint annotations Date: Wed, 30 Sep 2020 00:31:23 -0400 Message-Id: <20200930043150.1454766-20-jsnow@redhat.com> In-Reply-To: <20200930043150.1454766-1-jsnow@redhat.com> References: <20200930043150.1454766-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/30 00:26:33 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.687, 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: Peter Maydell , Thomas Huth , Eduardo Habkost , Markus Armbruster , John Snow , Cleber Rosa , =?UTF-8?q?Alex=20Benn=C3=A9e?= 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" Annotations do not change runtime behavior. This commit *only* adds annotations. Signed-off-by: John Snow Reviewed-by: Eduardo Habkost Reviewed-by: Cleber Rosa --- scripts/qapi/common.py | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/scripts/qapi/common.py b/scripts/qapi/common.py index 338adedef4f..74a2c001ed9 100644 --- a/scripts/qapi/common.py +++ b/scripts/qapi/common.py @@ -12,6 +12,7 @@ # See the COPYING file in the top-level directory. =20 import re +from typing import Optional, Sequence =20 =20 EATSPACE =3D '\033EATSPACE.' @@ -22,7 +23,7 @@ # ENUMName -> ENUM_NAME, EnumName1 -> ENUM_NAME1 # ENUM_NAME -> ENUM_NAME, ENUM_NAME1 -> ENUM_NAME1, ENUM_Name2 -> ENUM_NAM= E2 # ENUM24_Name -> ENUM24_NAME -def camel_to_upper(value): +def camel_to_upper(value: str) -> str: c_fun_str =3D c_name(value, False) if value.isupper(): return c_fun_str @@ -41,7 +42,9 @@ def camel_to_upper(value): return new_name.lstrip('_').upper() =20 =20 -def c_enum_const(type_name, const_name, prefix=3DNone): +def c_enum_const(type_name: str, + const_name: str, + prefix: Optional[str] =3D None) -> str: if prefix is not None: type_name =3D prefix return camel_to_upper(type_name) + '_' + c_name(const_name, False).upp= er() @@ -56,7 +59,7 @@ def c_enum_const(type_name, const_name, prefix=3DNone): # into substrings of a generated C function name. # '__a.b_c' -> '__a_b_c', 'x-foo' -> 'x_foo' # protect=3DTrue: 'int' -> 'q_int'; protect=3DFalse: 'int' -> 'int' -def c_name(name, protect=3DTrue): +def c_name(name: str, protect: bool =3D True) -> str: # ANSI X3J11/88-090, 3.1.1 c89_words =3D set(['auto', 'break', 'case', 'char', 'const', 'continue= ', 'default', 'do', 'double', 'else', 'enum', 'extern', @@ -131,24 +134,24 @@ def decrease(self, amount: int =3D 4) -> None: =20 # Generate @code with @kwds interpolated. # Obey indent, and strip EATSPACE. -def cgen(code, **kwds): +def cgen(code: str, **kwds: object) -> str: raw =3D code % kwds if indent: raw =3D re.sub(r'^(?!(#|$))', str(indent), raw, flags=3Dre.MULTILI= NE) return re.sub(re.escape(EATSPACE) + r' *', '', raw) =20 =20 -def mcgen(code, **kwds): +def mcgen(code: str, **kwds: object) -> str: if code[0] =3D=3D '\n': code =3D code[1:] return cgen(code, **kwds) =20 =20 -def c_fname(filename): +def c_fname(filename: str) -> str: return re.sub(r'[^A-Za-z0-9_]', '_', filename) =20 =20 -def guardstart(name): +def guardstart(name: str) -> str: return mcgen(''' #ifndef %(name)s #define %(name)s @@ -157,7 +160,7 @@ def guardstart(name): name=3Dc_fname(name).upper()) =20 =20 -def guardend(name): +def guardend(name: str) -> str: return mcgen(''' =20 #endif /* %(name)s */ @@ -165,7 +168,7 @@ def guardend(name): name=3Dc_fname(name).upper()) =20 =20 -def gen_if(ifcond): +def gen_if(ifcond: Sequence[str]) -> str: ret =3D '' for ifc in ifcond: ret +=3D mcgen(''' @@ -174,7 +177,7 @@ def gen_if(ifcond): return ret =20 =20 -def gen_endif(ifcond): +def gen_endif(ifcond: Sequence[str]) -> str: ret =3D '' for ifc in reversed(ifcond): ret +=3D mcgen(''' @@ -183,7 +186,9 @@ def gen_endif(ifcond): return ret =20 =20 -def build_params(arg_type, boxed, extra=3DNone): +def build_params(arg_type, + boxed: bool, + extra: Optional[str] =3D None) -> str: ret =3D '' sep =3D '' if boxed: --=20 2.26.2