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=-13.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 EAD36C433ED for ; Sun, 25 Apr 2021 07:55:27 +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 548C461480 for ; Sun, 25 Apr 2021 07:55:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 548C461480 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]:46302 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1laZby-0001zx-3o for qemu-devel@archiver.kernel.org; Sun, 25 Apr 2021 03:55:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35658) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1laZb7-0001ai-Lh for qemu-devel@nongnu.org; Sun, 25 Apr 2021 03:54:33 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:25791) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1laZb4-0004i2-F2 for qemu-devel@nongnu.org; Sun, 25 Apr 2021 03:54:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619337268; 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: in-reply-to:in-reply-to:references:references; bh=sztiFJ+SQ7Laxf7wcDA894QwKp28qIx4MQdQnZZ2PPw=; b=NEr6Rg7tnEXmR1mzlMmJtWERRlWxnFlEWrIPTravOoZ6EsDzE/GyopWChRvBQo4fiPVaQD oiCRoJfjmXszT8HvB/VsQTE++wJTNwY15m95f55GpVb9tBNdjEc/R1coFQJ7QsIqldRaKq SjVZxiEXcozqLY9npNE8vjqfcH5DvC0= 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-512-_UxSF_QQM9uHuTgSl_jDGg-1; Sun, 25 Apr 2021 03:54:27 -0400 X-MC-Unique: _UxSF_QQM9uHuTgSl_jDGg-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 CFAB2343A3; Sun, 25 Apr 2021 07:54:25 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-114-17.ams2.redhat.com [10.36.114.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 85E7760BE5; Sun, 25 Apr 2021 07:54:25 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 17893113525D; Sun, 25 Apr 2021 09:54:24 +0200 (CEST) From: Markus Armbruster To: John Snow Subject: Re: [PATCH 09/22] qapi: add match_nofail helper References: <20210422030720.3685766-1-jsnow@redhat.com> <20210422030720.3685766-10-jsnow@redhat.com> Date: Sun, 25 Apr 2021 09:54:24 +0200 In-Reply-To: <20210422030720.3685766-10-jsnow@redhat.com> (John Snow's message of "Wed, 21 Apr 2021 23:07:07 -0400") Message-ID: <871ray94un.fsf@dusky.pond.sub.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@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 , qemu-devel@nongnu.org, Eduardo Habkost , Cleber Rosa Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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. > 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. I wish we could have more stating typing with less notational overhead, but no free lunch... [...]