From nobody Mon Feb 9 12:15:16 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1619033257; cv=none; d=zohomail.com; s=zohoarc; b=HvMDHQDippP7WmvpY7n3jO9a1id2p7W1keHidaVDFbk8dpMAEwXoTDCSPcTAbHefYAQAq/SWArf65QBZx9bQapqteGaMb+OkGOgpdigxiEwZ4QRCfRft9i35eafKf8qlBb6Xk1zpcSnd2+by4xNodOhUAjGdyZqR7cVBJXnqeS8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619033257; 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=oNjYbJmAWqqsSY03QnHmyUPUGm5MRQ02Y2/NtVK6rIg=; b=H7NmNepmy1zS0Ulo5G83toIRJa+rJnyv8ppEjq4QO9AXYYRVlO4F53/STq/xJkbe4+A41PKGiCq1rZfz2OYlyFhtmmSB0/qc2F965Su2iqwZlDQtneG6+w09QCozAqBSnWyHj8WdNw7xEW0qvulOES8khKCdN+hXJQdwA8sd/5E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 1619033257976358.0131252620056; Wed, 21 Apr 2021 12:27:37 -0700 (PDT) Received: from localhost ([::1]:56660 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lZIVc-0000Qq-WD for importer@patchew.org; Wed, 21 Apr 2021 15:27:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42926) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lZIQw-0003hu-2Q for qemu-devel@nongnu.org; Wed, 21 Apr 2021 15:22:46 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:24007) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lZIQr-0005Wg-Tn for qemu-devel@nongnu.org; Wed, 21 Apr 2021 15:22:45 -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-565-zMb1oKDsPAWXXj-mx50pYw-1; Wed, 21 Apr 2021 15:22:38 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B8094107ACCA; Wed, 21 Apr 2021 19:22:37 +0000 (UTC) Received: from scv.redhat.com (ovpn-118-152.rdu2.redhat.com [10.10.118.152]) by smtp.corp.redhat.com (Postfix) with ESMTP id E8D395C1B4; Wed, 21 Apr 2021 19:22:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619032961; 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=oNjYbJmAWqqsSY03QnHmyUPUGm5MRQ02Y2/NtVK6rIg=; b=KV/wr8otm0Xs3m4+pPdz27ElCR8YGh8sKvo2n5ZjnRO5B0YHmVvNMMEq7jWKzbpsjIX9zI qrndx2bpEAy8AkZ40zS3/VNE3Qhk4+i8lTVpmblpwHTgv+qJaa4EMrL2BlXNrGYS3QguaL tNNT7ZhtCAoaOxTBpsoviqwp4lPDwtQ= X-MC-Unique: zMb1oKDsPAWXXj-mx50pYw-1 From: John Snow To: qemu-devel@nongnu.org, Markus Armbruster Subject: [PATCH v3 3/8] qapi/error: Make QAPISourceError 'col' parameter optional Date: Wed, 21 Apr 2021 15:22:28 -0400 Message-Id: <20210421192233.3542904-4-jsnow@redhat.com> In-Reply-To: <20210421192233.3542904-1-jsnow@redhat.com> References: <20210421192233.3542904-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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-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=216.205.24.124; envelope-from=jsnow@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: Peter Maydell , John Snow , Eduardo Habkost , Michael Roth , Cleber Rosa Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" It's already treated as optional, with one direct caller and some subclass callers passing 'None'. Make it officially optional, which requires moving the position of the argument to come after all required parameters. QAPISemError becomes functionally identical to QAPISourceError. Keep the name to preserve its semantic meaning and avoid code churn, but remove the now-useless __init__ wrapper. Signed-off-by: John Snow --- scripts/qapi/error.py | 8 +++----- scripts/qapi/schema.py | 3 +-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/scripts/qapi/error.py b/scripts/qapi/error.py index 38bd7c4dd6a..d179a3bd0c7 100644 --- a/scripts/qapi/error.py +++ b/scripts/qapi/error.py @@ -18,11 +18,11 @@ class QAPIError(Exception): =20 class QAPISourceError(QAPIError): """Error class for all exceptions identifying a source location.""" - def __init__(self, info, col, msg): + def __init__(self, info, msg, col=3DNone): super().__init__() self.info =3D info - self.col =3D col self.msg =3D msg + self.col =3D col =20 def __str__(self): loc =3D str(self.info) @@ -41,10 +41,8 @@ def __init__(self, parser, msg): col =3D (col + 7) % 8 + 1 else: col +=3D 1 - super().__init__(parser.info, col, msg) + super().__init__(parser.info, msg, col) =20 =20 class QAPISemError(QAPISourceError): """Error class for semantic QAPI errors.""" - def __init__(self, info, msg): - super().__init__(info, None, msg) diff --git a/scripts/qapi/schema.py b/scripts/qapi/schema.py index c277fcacc53..3a4172fb749 100644 --- a/scripts/qapi/schema.py +++ b/scripts/qapi/schema.py @@ -875,8 +875,7 @@ def _def_entity(self, ent): other_ent =3D self._entity_dict.get(ent.name) if other_ent: if other_ent.info: - where =3D QAPISourceError(other_ent.info, None, - "previous definition") + where =3D QAPISourceError(other_ent.info, "previous defini= tion") raise QAPISemError( ent.info, "'%s' is already defined\n%s" % (ent.name, where)) --=20 2.30.2