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=-11.3 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, NICE_REPLY_A,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 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 1377CC4346E for ; Fri, 25 Sep 2020 01:32:16 +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 7207820838 for ; Fri, 25 Sep 2020 01:32:15 +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="MSaF5sbe" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7207820838 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]:33110 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kLcas-0005Md-HQ for qemu-devel@archiver.kernel.org; Thu, 24 Sep 2020 21:32:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33688) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kLcZU-0004a0-JS for qemu-devel@nongnu.org; Thu, 24 Sep 2020 21:30:48 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:44375) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kLcZS-0007eZ-00 for qemu-devel@nongnu.org; Thu, 24 Sep 2020 21:30:48 -0400 Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600997444; 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=5784NNKgBn2KzKmVhMWiT34Td2hy5CgFp/oF8bgcG7A=; b=MSaF5sbeVkcp//ZxQqwMwbCgbjcLXGwEQmO5LWL5mUFMHlANOAp4hFEinnChT78xNPYWoE 1R78T7jY89cTWvZ4TDBVvL9QqLik6H8z7yBwWY5FrC/iI2LtdDaBVUvaW1VwXcpD0sQDde NZMdHehxvndRQNZV721HgSuV4F3zrN0= 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-463-OlVjMWHLNQuKDbonkF-zFQ-1; Thu, 24 Sep 2020 21:30:42 -0400 X-MC-Unique: OlVjMWHLNQuKDbonkF-zFQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 10F7781F006; Fri, 25 Sep 2020 01:30:41 +0000 (UTC) Received: from [10.10.119.140] (ovpn-119-140.rdu2.redhat.com [10.10.119.140]) by smtp.corp.redhat.com (Postfix) with ESMTP id 645E960C17; Fri, 25 Sep 2020 01:30:40 +0000 (UTC) Subject: Re: [PATCH 04/16] qapi/expr.py: Add assertion for union type 'check_dict' To: Eduardo Habkost References: <20200922211313.4082880-1-jsnow@redhat.com> <20200922211313.4082880-5-jsnow@redhat.com> <20200923195322.GE3312949@habkost.net> <20200925010857.GM3717385@habkost.net> From: John Snow Message-ID: <7e40f8a3-e87f-2786-aef7-79f9a8015a58@redhat.com> Date: Thu, 24 Sep 2020 21:30:39 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.11.0 MIME-Version: 1.0 In-Reply-To: <20200925010857.GM3717385@habkost.net> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit 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/22 23:02:20 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.199, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.214, 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: qemu-devel@nongnu.org, Markus Armbruster , Michael Roth , Cleber Rosa Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 9/24/20 9:08 PM, Eduardo Habkost wrote: > On Thu, Sep 24, 2020 at 08:47:31PM -0400, John Snow wrote: >> On 9/23/20 3:53 PM, Eduardo Habkost wrote: >>> On Tue, Sep 22, 2020 at 05:13:01PM -0400, John Snow wrote: >>>> mypy isn't fond of allowing you to check for bool membership in a >>>> collection of str elements. Guard this lookup for precisely when we were >>>> given a name. >>>> >>>> Signed-off-by: John Snow >>>> --- >>>> scripts/qapi/expr.py | 4 +++- >>>> 1 file changed, 3 insertions(+), 1 deletion(-) >>>> >>>> diff --git a/scripts/qapi/expr.py b/scripts/qapi/expr.py >>>> index f6b55a87c1..67892502e9 100644 >>>> --- a/scripts/qapi/expr.py >>>> +++ b/scripts/qapi/expr.py >>>> @@ -166,7 +166,9 @@ def check_type(value, info, source, >>>> raise QAPISemError(info, >>>> "%s should be an object or type name" % source) >>>> - permit_upper = allow_dict in info.pragma.name_case_whitelist >>>> + permit_upper = False >>>> + if isinstance(allow_dict, str): >>>> + permit_upper = allow_dict in info.pragma.name_case_whitelist >>> >>> Well, this keeps existing behavior, so: >>> >>> Reviewed-by: Eduardo Habkost >>> >>> But: what exactly is the meaning of allow_dict=False, >>> allow_dict=True, and allow_dict being a string? >>> >>> >> >> allow_dict = True -- allows the type to be an object describing the type. >> >> allow_dict: str -- allows the type to be an object (like True), but also >> passes a name in for the purposes of validating the name with the pragma >> whitelist(!) > > What. (lol) > What's going on here is that when you pass in a name, bool(allow_dict) is True -- so we will allow the object being checked here to be a dict. Also, when you pass in a name, that name is looked up in info.pragma.name_case_whitelist to check if the names of the keys in the dict being checked (again, allow_dict is implicitly true here) are allowed to use uppercase names. I have some more experimental patches I didn't want to mix in with the type checking patches that try to extract pragma checks from this code and perform them elsewhere; but that's going to come much, much later. --js