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=-15.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,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 BDD58C433ED for ; Mon, 26 Apr 2021 17:50:02 +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 390B461007 for ; Mon, 26 Apr 2021 17:50:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 390B461007 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]:58228 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lb5Mv-000805-82 for qemu-devel@archiver.kernel.org; Mon, 26 Apr 2021 13:50:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60894) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lb5Lj-0006jp-Db for qemu-devel@nongnu.org; Mon, 26 Apr 2021 13:48:47 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:32052) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lb5Ld-00085U-Rp for qemu-devel@nongnu.org; Mon, 26 Apr 2021 13:48:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619459320; 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=q6TP1l8y7oxOvqf1vkxiEnBHQBfjgu5QNl1vvmW9Qas=; b=XKHMZ9faJsEdXsoDkfaI9Yvw3X817pTPiZhisHt1EPlvgksjjIVfqSr8GUuHfILh3Pdi6q PcK5MwaasfX+IeDmBWHTmaJTXuM0Y3NgWTnhcZDhoMmt9x2QjJCBlrhb3t6sqDYFkthqbs YLcbFeVoeTkKkBB3jKSn0oUroZvvLRU= 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-472-LiQNUKkgOnuxLZLt0WDa5g-1; Mon, 26 Apr 2021 13:48:38 -0400 X-MC-Unique: LiQNUKkgOnuxLZLt0WDa5g-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9579B107ACCA; Mon, 26 Apr 2021 17:48:37 +0000 (UTC) Received: from [10.10.120.13] (ovpn-120-13.rdu2.redhat.com [10.10.120.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0FA875D9CD; Mon, 26 Apr 2021 17:48:36 +0000 (UTC) Subject: Re: [PATCH 09/22] qapi: add match_nofail helper To: Markus Armbruster References: <20210422030720.3685766-1-jsnow@redhat.com> <20210422030720.3685766-10-jsnow@redhat.com> <871ray94un.fsf@dusky.pond.sub.org> From: John Snow Message-ID: Date: Mon, 26 Apr 2021 13:48:36 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.1 MIME-Version: 1.0 In-Reply-To: <871ray94un.fsf@dusky.pond.sub.org> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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=170.10.133.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.219, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.001, 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 , qemu-devel@nongnu.org, Eduardo Habkost , Cleber Rosa Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 4/25/21 3:54 AM, Markus Armbruster wrote: > John Snow writes: > >> Mypy cannot generally understand that these regex functions cannot >> possibly fail. Add a _nofail helper that clarifies this for mypy. > > Convention wants a blank line here. > Tooling failure. stg pop -a while stg push; and stg edit --sign; done (Will fix, but not so sure about fixing the tool...) >> Signed-off-by: John Snow >> --- >> scripts/qapi/common.py | 8 +++++++- >> scripts/qapi/main.py | 6 ++---- >> scripts/qapi/parser.py | 13 +++++++------ >> 3 files changed, 16 insertions(+), 11 deletions(-) >> >> diff --git a/scripts/qapi/common.py b/scripts/qapi/common.py >> index cbd3fd81d36..d38c1746767 100644 >> --- a/scripts/qapi/common.py >> +++ b/scripts/qapi/common.py >> @@ -12,7 +12,7 @@ >> # See the COPYING file in the top-level directory. >> >> import re >> -from typing import Optional, Sequence >> +from typing import Match, Optional, Sequence >> >> >> #: Magic string that gets removed along with all space to its right. >> @@ -210,3 +210,9 @@ def gen_endif(ifcond: Sequence[str]) -> str: >> #endif /* %(cond)s */ >> ''', cond=ifc) >> return ret >> + >> + >> +def match_nofail(pattern: str, string: str) -> Match[str]: >> + match = re.match(pattern, string) >> + assert match is not None >> + return match > > Name it must_match()? You choose. > If you think it reads genuinely better, sure. > I wish we could have more stating typing with less notational overhead, > but no free lunch... > > [...] >