From nobody Mon Feb 9 07:55:40 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1602323983; cv=none; d=zohomail.com; s=zohoarc; b=KsNLtsg2o9GtTTH5rV9c6m5M2cmczDMphDFRL8CiGfaJeoRSSORfKPjRarGa9zeIzCNzh5Qw1pbvtFR9bP2ZoSCcXcD+6x92+iNMMaqvQ6fC54lkjgh9oiDQBllcMV3NX1E1YdF9lKvKXc7CMxZ3GjRuu/Jz5v9QQSgHuxXDFro= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602323983; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=TX4GsUaHQ8PKUb5mF956KWjslJil9nhOPgkL7tiqrj0=; b=Eg+Y8sJYiuvVrdnn3O9Os7jOTo3y8Q+4Ugiz0bA0+TjZJv3pkDkxG7BBr03jd2FR2D5kDLI/XCRyz1cST8Xjm5Sr1WAHbweIVHNrsH8QNpSLnD9vn0NZ5vwQXCGEYTdHrH6dEwGr3mcqXsTUCXXTzD0rnnerMfIsf3LeBHt7Ax8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1602323983021974.1118193973278; Sat, 10 Oct 2020 02:59:43 -0700 (PDT) Received: from localhost ([::1]:53184 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kRBfB-0004V9-M5 for importer@patchew.org; Sat, 10 Oct 2020 05:59:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60496) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kRBax-0007g5-NT for qemu-devel@nongnu.org; Sat, 10 Oct 2020 05:55:19 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:33211) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kRBar-0002iI-3X for qemu-devel@nongnu.org; Sat, 10 Oct 2020 05:55:19 -0400 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-382-gu9rRReGMiOdBRADfwMe4w-1; Sat, 10 Oct 2020 05:55:09 -0400 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 4D8CE1005E6C; Sat, 10 Oct 2020 09:55:08 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-182.ams2.redhat.com [10.36.112.182]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1FCA65DA2A; Sat, 10 Oct 2020 09:55:08 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id B8EC3112CE1F; Sat, 10 Oct 2020 11:55:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602323712; 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=TX4GsUaHQ8PKUb5mF956KWjslJil9nhOPgkL7tiqrj0=; b=QDQyrM3Pypxiz0Fy9xrCwVzgiBv9KAUDql6Z2hMRDnmlSQlhGR5lHTcUacYlRNdGJb82Rf x9zsT86vNP9bneGEszosR0hpx+IsEClJr/OJWIpW0FEiv+aSn9JaLizm5MOvvY0XlGZxvq VLxzgAES7TcdCdlZTnf1KGhtgS/UduQ= X-MC-Unique: gu9rRReGMiOdBRADfwMe4w-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 10/34] qapi/common.py: Remove python compatibility workaround Date: Sat, 10 Oct 2020 11:54:40 +0200 Message-Id: <20201010095504.796182-11-armbru@redhat.com> In-Reply-To: <20201010095504.796182-1-armbru@redhat.com> References: <20201010095504.796182-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=63.128.21.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/10 03:36:24 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_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: peter.maydell@linaro.org, John Snow , Eduardo Habkost , Cleber Rosa Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: John Snow Signed-off-by: John Snow Reviewed-by: Eduardo Habkost Reviewed-by: Cleber Rosa Message-Id: <20201009161558.107041-11-jsnow@redhat.com> Reviewed-by: Markus Armbruster Signed-off-by: Markus Armbruster --- 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..cee63eb95c 100644 --- a/scripts/qapi/common.py +++ b/scripts/qapi/common.py @@ -119,10 +119,7 @@ def cgen(code, **kwds): raw =3D code % kwds if indent_level: indent =3D genindent(indent_level) - # re.subn() lacks flags support before Python 2.7, use re.compile() - raw =3D re.subn(re.compile(r'^(?!(#|$))', re.MULTILINE), - indent, raw) - raw =3D raw[0] + raw =3D re.sub(r'^(?!(#|$))', indent, raw, flags=3Dre.MULTILINE) return re.sub(re.escape(eatspace) + r' *', '', raw) =20 =20 --=20 2.26.2