From patchwork Wed Apr 21 18:20:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Snow X-Patchwork-Id: 1468795 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=KYdUJo6T; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4FQTRB4bhQz9sPf for ; Thu, 22 Apr 2021 04:21:58 +1000 (AEST) Received: from localhost ([::1]:42830 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lZHU4-0002cQ-JA for incoming@patchwork.ozlabs.org; Wed, 21 Apr 2021 14:21:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58970) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lZHSr-0002bT-1C for qemu-devel@nongnu.org; Wed, 21 Apr 2021 14:20:42 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:50468) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lZHSo-0003d1-AM for qemu-devel@nongnu.org; Wed, 21 Apr 2021 14:20:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619029237; 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; bh=vAYz37xoR+rwXZJi0SA65+plXMrULnCJM+cuX9t/8ZM=; b=KYdUJo6TRLiJroaQ2Wkp10ISYpe4YSXXTV+3Jp1xhLT6y+0o6bxqnjWO7cCiGIde9pPw31 1uX1iOviQkgY1AxU7LL6WY2bUxqVhhuS1nVZw1I1R9qR3Xi0vKAbdp+tmEZomb7g7IX6PS 7EIo+O1Ixhh30M+1UkkDaJH47FCW6VQ= 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-599-NiVlqq5GMl2gSWcZPe8xRg-1; Wed, 21 Apr 2021 14:20:34 -0400 X-MC-Unique: NiVlqq5GMl2gSWcZPe8xRg-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5C8FE84B9A1; Wed, 21 Apr 2021 18:20:33 +0000 (UTC) Received: from scv.redhat.com (ovpn-118-152.rdu2.redhat.com [10.10.118.152]) by smtp.corp.redhat.com (Postfix) with ESMTP id 842B919D9B; Wed, 21 Apr 2021 18:20:32 +0000 (UTC) From: John Snow To: Markus Armbruster , qemu-devel@nongnu.org Subject: [PATCH v5 00/17] qapi: static typing conversion, pt3 Date: Wed, 21 Apr 2021 14:20:15 -0400 Message-Id: <20210421182032.3521476-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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 Received-SPF: pass client-ip=216.205.24.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com 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.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: Michael Roth , John Snow , Eduardo Habkost , Cleber Rosa Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Hi, this series adds static types to the QAPI module. This is part three, and it focuses on expr.py. Environment: - Python >= 3.6, <= 3.8 * - mypy >= 0.770 - pylint >= 2.6.0 - flake8 - isort Every commit should pass with (from ./scripts/): - flake8 qapi/ - pylint --rcfile=qapi/pylintrc qapi/ - mypy --config-file=qapi/mypy.ini qapi/ - pushd qapi && isort -c . && popd V5: 001/17:[----] [--] 'qapi/expr: Comment cleanup' 002/19: -DROPPED- 'flake8: Enforce shorter line length for comments and docstrings' 002/17:[----] [--] 'qapi/expr.py: Remove 'info' argument from nested check_if_str' 003/17:[----] [--] 'qapi/expr.py: Check for dict instead of OrderedDict' 004/17:[0006] [FC] 'qapi/expr.py: constrain incoming expression types' 005/17:[----] [--] 'qapi/expr.py: Add assertion for union type 'check_dict'' 006/17:[----] [--] 'qapi/expr.py: move string check upwards in check_type' 007/17:[down] 'qapi/expr.py: Check type of union and alternate 'data' member' 008/19: -MERGED- ^ 'qapi: add tests for invalid 'data' field type' 009/19: -MERGED- ^ 'qapi/expr.py: Check type of 'data' member' 008/17:[0004] [FC] 'qapi/expr.py: Add casts in a few select cases' 009/17:[----] [--] 'qapi/expr.py: Modify check_keys to accept any Collection' 010/17:[----] [-C] 'qapi/expr.py: add type hint annotations' 011/17:[0013] [FC] 'qapi/expr.py: Consolidate check_if_str calls in check_if' 012/17:[----] [--] 'qapi/expr.py: Remove single-letter variable' 013/17:[----] [--] 'qapi/expr.py: enable pylint checks' 014/17:[down] 'qapi/expr: Only explicitly prohibit 'Kind' nor 'List' for type names' 015/17:[0227] [FC] 'qapi/expr.py: Add docstrings' 016/17:[----] [-C] 'qapi/expr.py: Use tuples instead of lists for static data' 017/17:[down] 'qapi/expr: Update authorship and copyright information' 018/19: -DROPPED- 'qapi/expr.py: move related checks inside check_xxx functions' 019/19: -DROPPED- 'qapi/expr.py: Use an expression checker dispatch table' - Dropped what was 02, 18, 19. - Merged what was 08, 09 into what is now 07. - 04: Expanded comment for _JSONObject type alias. - 07: "New", combines the fix and the test patches from the previous series into one patch. - 08: Fixed spelling of "Checked" from "Asserted" - 11: Reverted back to Python2 style string interpolation - 14: New, fix the code to reflect the docs for Kind/List reservations. - 15: Many, many docstring changes. (Too many to list!) - 17: New, update copyright/authorship. (Could be folded into 15 if desired, as that's what I'm claiming credit for.) John Snow (17): qapi/expr: Comment cleanup qapi/expr.py: Remove 'info' argument from nested check_if_str qapi/expr.py: Check for dict instead of OrderedDict qapi/expr.py: constrain incoming expression types qapi/expr.py: Add assertion for union type 'check_dict' qapi/expr.py: move string check upwards in check_type qapi/expr.py: Check type of union and alternate 'data' member qapi/expr.py: Add casts in a few select cases qapi/expr.py: Modify check_keys to accept any Collection qapi/expr.py: add type hint annotations qapi/expr.py: Consolidate check_if_str calls in check_if qapi/expr.py: Remove single-letter variable qapi/expr.py: enable pylint checks qapi/expr: Only explicitly prohibit 'Kind' nor 'List' for type names qapi/expr.py: Add docstrings qapi/expr.py: Use tuples instead of lists for static data qapi/expr: Update authorship and copyright information scripts/qapi/expr.py | 444 +++++++++++++++--- scripts/qapi/mypy.ini | 5 - scripts/qapi/pylintrc | 1 - tests/qapi-schema/alternate-data-invalid.err | 2 + tests/qapi-schema/alternate-data-invalid.json | 4 + tests/qapi-schema/alternate-data-invalid.out | 0 tests/qapi-schema/meson.build | 2 + tests/qapi-schema/union-invalid-data.err | 2 + tests/qapi-schema/union-invalid-data.json | 6 + tests/qapi-schema/union-invalid-data.out | 0 10 files changed, 385 insertions(+), 81 deletions(-) create mode 100644 tests/qapi-schema/alternate-data-invalid.err create mode 100644 tests/qapi-schema/alternate-data-invalid.json create mode 100644 tests/qapi-schema/alternate-data-invalid.out create mode 100644 tests/qapi-schema/union-invalid-data.err create mode 100644 tests/qapi-schema/union-invalid-data.json create mode 100644 tests/qapi-schema/union-invalid-data.out Reviewed-by: Markus Armbruster