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=-9.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,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 9F8D4C43461 for ; Wed, 16 Sep 2020 12:38:29 +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 01AEF22225 for ; Wed, 16 Sep 2020 12:38:28 +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="LcBBDYf3" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 01AEF22225 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]:33780 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kIWhf-0000vX-W2 for qemu-devel@archiver.kernel.org; Wed, 16 Sep 2020 08:38:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39040) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kIWeG-0004yg-Tq for qemu-devel@nongnu.org; Wed, 16 Sep 2020 08:34:56 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:46288 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kIWeE-0006AE-OX for qemu-devel@nongnu.org; Wed, 16 Sep 2020 08:34:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600259693; 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=oZv9lHp2x/wyqj12lvvVR2Bw6DbbBRqkLadX/QHTKcg=; b=LcBBDYf3KFtMGhjidTth8XbBDH1iwdUDLKp6rHac8yIBzj7JkaxSqe5ffYogdnlk9nhe+R 9SUQA5uXfDxJNLYfLXF46bgT8sp7tVPfo8JQAwVAIc1DOYt9XY1oHSJWeHUJV1yDvU6c/n yrOUuLq3hAcP4/eoAQtYsa03t3jxpZk= 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-240-1pgOraCbMQyPQjI5_zGMFg-1; Wed, 16 Sep 2020 08:34:48 -0400 X-MC-Unique: 1pgOraCbMQyPQjI5_zGMFg-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 6B56681F010; Wed, 16 Sep 2020 12:34:47 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-114-66.ams2.redhat.com [10.36.114.66]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3847460BFA; Wed, 16 Sep 2020 12:34:47 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id B9CA5113864A; Wed, 16 Sep 2020 14:34:45 +0200 (CEST) From: Markus Armbruster To: John Snow Subject: Re: [PATCH 08/37] qapi/common.py: Remove python compatibility workaround References: <20200915224027.2529813-1-jsnow@redhat.com> <20200915224027.2529813-9-jsnow@redhat.com> Date: Wed, 16 Sep 2020 14:34:45 +0200 In-Reply-To: <20200915224027.2529813-9-jsnow@redhat.com> (John Snow's message of "Tue, 15 Sep 2020 18:39:58 -0400") Message-ID: <87ft7hoq6y.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.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain Received-SPF: pass client-ip=205.139.110.61; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/16 00:53:39 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -50 X-Spam_score: -5.1 X-Spam_bar: ----- X-Spam_report: (-5.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.999, 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_H2=-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 , Cleber Rosa , Alex =?utf-8?Q?Benn=C3=A9e?= , qemu-devel@nongnu.org, Eduardo Habkost Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" John Snow writes: > Signed-off-by: John Snow > --- > scripts/qapi/common.py | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > > diff --git a/scripts/qapi/common.py b/scripts/qapi/common.py > index ba35abea47..4fb265a8bf 100644 > --- a/scripts/qapi/common.py > +++ b/scripts/qapi/common.py > @@ -119,10 +119,7 @@ def cgen(code, **kwds): > raw = code % kwds > if indent_level: > indent = genindent(indent_level) > - # re.subn() lacks flags support before Python 2.7, use re.compile() > - raw = re.subn(re.compile(r'^(?!(#|$))', re.MULTILINE), > - indent, raw) > - raw = raw[0] > + raw, _ = re.subn(r'^(?!(#|$))', indent, raw, flags=re.MULTILINE) > return re.sub(re.escape(eatspace) + r' *', '', raw) I missed this one in my "qapi: Bye-bye Python 2" series. Can we use re.sub() instead?