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=-6.8 required=3.0 tests=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 0E343CA9EA1 for ; Fri, 18 Oct 2019 07:58:34 +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 D8DD121897 for ; Fri, 18 Oct 2019 07:58:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D8DD121897 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]:36140 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLN9c-0008Rx-Ew for qemu-devel@archiver.kernel.org; Fri, 18 Oct 2019 03:58:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59499) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLMvP-0000RO-K0 for qemu-devel@nongnu.org; Fri, 18 Oct 2019 03:43:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iLMvO-0007fN-L0 for qemu-devel@nongnu.org; Fri, 18 Oct 2019 03:43:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36438) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iLMvO-0007ev-Fd for qemu-devel@nongnu.org; Fri, 18 Oct 2019 03:43:50 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A179D3D965; Fri, 18 Oct 2019 07:43:49 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.36.118.123]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1688410027A8; Fri, 18 Oct 2019 07:43:47 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 888ED1132D6D; Fri, 18 Oct 2019 09:43:45 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH v2 3/7] qapi: Eliminate accidental global frontend state Date: Fri, 18 Oct 2019 09:43:41 +0200 Message-Id: <20191018074345.24034-4-armbru@redhat.com> In-Reply-To: <20191018074345.24034-1-armbru@redhat.com> References: <20191018074345.24034-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Fri, 18 Oct 2019 07:43:49 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 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: kwolf@redhat.com, marcandre.lureau@redhat.com, mdroth@linux.vnet.ibm.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" The frontend can't be run more than once due to its global state. A future commit will want to do that. The only global frontend state remaining is accidental: QAPISchemaParser.__init__()'s parameter previously_included=3D[]. Python evaluates the default once, at definition time. Any modifications to it are visible in subsequent calls. Well-known Python trap. Change the default to None and replace it by the real default in the function body. Use the opportunity to convert previously_included to a set. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- scripts/qapi/common.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/qapi/common.py b/scripts/qapi/common.py index 5abab44302..9d5c05f6a1 100644 --- a/scripts/qapi/common.py +++ b/scripts/qapi/common.py @@ -391,8 +391,9 @@ class QAPIDoc(object): =20 class QAPISchemaParser(object): =20 - def __init__(self, fname, previously_included=3D[], incl_info=3DNone= ): - previously_included.append(os.path.abspath(fname)) + def __init__(self, fname, previously_included=3DNone, incl_info=3DNo= ne): + previously_included =3D previously_included or set() + previously_included.add(os.path.abspath(fname)) =20 try: if sys.version_info[0] >=3D 3: --=20 2.21.0