From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A5CB7158041 for ; Sun, 24 Mar 2024 16:22:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A07E0E2A2A; Sun, 24 Mar 2024 16:22:43 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 87565E2A2A for ; Sun, 24 Mar 2024 16:22:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5531E34307D for ; Sun, 24 Mar 2024 16:22:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E05A715A1 for ; Sun, 24 Mar 2024 16:22:39 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1711297354.486e8cfb4fc99bbaa814479021fd134bac912937.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/tzdata/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/tzdata/tzdata-10000.ebuild dev-python/tzdata/tzdata-10001.ebuild X-VCS-Directories: dev-python/tzdata/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 486e8cfb4fc99bbaa814479021fd134bac912937 X-VCS-Branch: master Date: Sun, 24 Mar 2024 16:22:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 48c99632-1b52-449c-b040-cc80c24bf64f X-Archives-Hash: 0d743e64e377991487fbc429e607e0b2 commit: 486e8cfb4fc99bbaa814479021fd134bac912937 Author: Michał Górny gentoo org> AuthorDate: Sun Mar 24 16:11:22 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Mar 24 16:22:34 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=486e8cfb dev-python/tzdata: Use ModuleNotFoundError (in 10001) Replace `ImportError` with `ModuleNotFoundError` to fix dev-python/hypothesis, since it uses a more specific `except` block. It's technically a bit shifty since the module was clearly found but *shrug*. Signed-off-by: Michał Górny gentoo.org> dev-python/tzdata/{tzdata-10000.ebuild => tzdata-10001.ebuild} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-python/tzdata/tzdata-10000.ebuild b/dev-python/tzdata/tzdata-10001.ebuild similarity index 89% rename from dev-python/tzdata/tzdata-10000.ebuild rename to dev-python/tzdata/tzdata-10001.ebuild index b2ef5c03488f..5f843b77070e 100644 --- a/dev-python/tzdata/tzdata-10000.ebuild +++ b/dev-python/tzdata/tzdata-10001.ebuild @@ -32,6 +32,6 @@ src_unpack() { description = "tzdata shim to satisfy requirements (using system tzdata)" EOF cat > "${S}/tzdata.py" <<-EOF || die - raise ImportError("Please do not import tzdata, use zoneinfo module instead, see PEP 615") + raise ModuleNotFoundError("Please do not import tzdata, use zoneinfo module instead, see PEP 615") EOF }