From nobody Tue Feb 10 05:45:17 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=1632749307; cv=none; d=zohomail.com; s=zohoarc; b=azfxJelrlJQru2sBilARqJ2QtMNlWMb6lUgkTHJVs2sbHBQVfomZfWV1WDByDupMEa3go8Uw+0gdi/XhM0Z2rXFoI473NF+zUyF8MW4gihkxOC6I98ji7+SXb6/krA/ZQFXXbAx87j507RxzbB4YTKMIRQ66FrwLehGFQ1PzTto= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632749307; 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=LSG/uh8jCjcZoH005UyBUF4D20nFAhsXpBisETAju9A=; b=kgzdPFEhwngJjyihHCZLy64DiqWkUJTeucpAzTRjDUv1oNOOBAIrTZpqST/Euk2vcyF0UTTdbQTHg6GPbVJakfXPR09NRLLCXD+ENxXz7Qp6KxWrXPhmQpzqpeofbUkQhhj+0js80Szs/LBfZ76Bwh2PeGsiT/O0mzHAQ5GTKMk= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1632749307854975.3896641525939; Mon, 27 Sep 2021 06:28:27 -0700 (PDT) Received: from localhost ([::1]:35804 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mUqgE-0001Q9-OS for importer@patchew.org; Mon, 27 Sep 2021 09:28:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41982) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mUqLf-0003Y1-Hg for qemu-devel@nongnu.org; Mon, 27 Sep 2021 09:07:11 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:52141) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mUqLV-0003oL-Qu for qemu-devel@nongnu.org; Mon, 27 Sep 2021 09:07:11 -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-203-P21QmrYaNue-KlPDFvJsIA-1; Mon, 27 Sep 2021 09:06:58 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E65ED100C66D; Mon, 27 Sep 2021 13:06:57 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-14.ams2.redhat.com [10.36.112.14]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4FB182B399; Mon, 27 Sep 2021 13:06:53 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id CC77A1135A7F; Mon, 27 Sep 2021 15:06:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1632748021; 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=LSG/uh8jCjcZoH005UyBUF4D20nFAhsXpBisETAju9A=; b=AYyvgWGIk8T73PQdjoFaxyyjYwraT2c5W9bHGtnY+1NwEFjKjiJXgbWeRmLPWX0e6XJ3h5 mS8bp0pso7FDv2wvf1UcyTUIDf0/23mf9xrWY9yFzooxUL9NpFbF7SYFf3mjNqEEiwFAJS udTOgiIwuUpqnNiKd2P+hIviIIaxb8w= X-MC-Unique: P21QmrYaNue-KlPDFvJsIA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL v2 24/25] tests/qapi-schema: Use Python OSError instead of outmoded IOError Date: Mon, 27 Sep 2021 15:06:46 +0200 Message-Id: <20210927130647.1271533-25-armbru@redhat.com> In-Reply-To: <20210927130647.1271533-1-armbru@redhat.com> References: <20210927130647.1271533-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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; charset="utf-8" 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=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, RCVD_IN_DNSWL_LOW=-0.7, 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@linaro.org, John Snow , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1632749309841100001 https://docs.python.org/3.6/library/exceptions.html has Changed in version 3.3: EnvironmentError, IOError, WindowsError, socket.error, select.error and mmap.error have been merged into OSError, and the constructor may return a subclass. and The following exceptions are kept for compatibility with previous versions; starting from Python 3.3, they are aliases of OSError. exception EnvironmentError exception IOError exception WindowsError Only available on Windows. Switch to the preferred name. Signed-off-by: Markus Armbruster Message-Id: <20210922125619.670673-2-armbru@redhat.com> Reviewed-by: John Snow Reviewed-by: Philippe Mathieu-Daud=C3=A9 [Details added to commit message] --- tests/qapi-schema/test-qapi.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/qapi-schema/test-qapi.py b/tests/qapi-schema/test-qapi.py index 73cffae2b6..2e384f5efd 100755 --- a/tests/qapi-schema/test-qapi.py +++ b/tests/qapi-schema/test-qapi.py @@ -154,7 +154,7 @@ def test_and_diff(test_name, dir_name, update): errfp =3D open(os.path.join(dir_name, test_name + '.err'), mode) expected_out =3D outfp.readlines() expected_err =3D errfp.readlines() - except IOError as err: + except OSError as err: print("%s: can't open '%s': %s" % (sys.argv[0], err.filename, err.strerror), file=3Dsys.stderr) @@ -180,7 +180,7 @@ def test_and_diff(test_name, dir_name, update): errfp.truncate(0) errfp.seek(0) errfp.writelines(actual_err) - except IOError as err: + except OSError as err: print("%s: can't write '%s': %s" % (sys.argv[0], err.filename, err.strerror), file=3Dsys.stderr) --=20 2.31.1