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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7F4101581E7 for ; Sun, 21 Apr 2024 11:57:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9DD78E29E8; Sun, 21 Apr 2024 11:57:18 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 79268E29E8 for ; Sun, 21 Apr 2024 11:57:18 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0EE9134340F for ; Sun, 21 Apr 2024 11:57:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 22A091749 for ; Sun, 21 Apr 2024 11:57:15 +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: <1713700630.07a32969d5e4a1e81f5e6cee1ec2d0d0e44fedd8.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/mechanize/files/, dev-python/mechanize/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/mechanize/files/mechanize-0.4.9-test.patch dev-python/mechanize/mechanize-0.4.9.ebuild X-VCS-Directories: dev-python/mechanize/ dev-python/mechanize/files/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 07a32969d5e4a1e81f5e6cee1ec2d0d0e44fedd8 X-VCS-Branch: master Date: Sun, 21 Apr 2024 11:57:15 +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: 749839f2-3083-4ea5-bca1-c88454b8bad9 X-Archives-Hash: c5716896ae54358958619abdb56f6e7c commit: 07a32969d5e4a1e81f5e6cee1ec2d0d0e44fedd8 Author: Michał Górny gentoo org> AuthorDate: Sun Apr 21 11:56:18 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Apr 21 11:57:10 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07a32969 dev-python/mechanize: Backport a test fix Closes: https://bugs.gentoo.org/930257 Signed-off-by: Michał Górny gentoo.org> .../mechanize/files/mechanize-0.4.9-test.patch | 23 ++++++++++++++++++++++ dev-python/mechanize/mechanize-0.4.9.ebuild | 9 +++++++-- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dev-python/mechanize/files/mechanize-0.4.9-test.patch b/dev-python/mechanize/files/mechanize-0.4.9-test.patch new file mode 100644 index 000000000000..369cbe9495e1 --- /dev/null +++ b/dev-python/mechanize/files/mechanize-0.4.9-test.patch @@ -0,0 +1,23 @@ +From 1324b09b661aaac7d4cdc7e1e9d49e1c3851db2c Mon Sep 17 00:00:00 2001 +From: Martin Weinelt +Date: Sun, 21 Apr 2024 13:05:45 +0200 +Subject: [PATCH] Fix test_ftp mime type expectation on 3.11+ + +Closes: #94 +--- + test/test_urllib2.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/test_urllib2.py b/test/test_urllib2.py +index e9b96fd..c46a2fc 100644 +--- a/test/test_urllib2.py ++++ b/test/test_urllib2.py +@@ -864,7 +864,7 @@ def connect_ftp(self, user, passwd, host, port, dirs, timeout): + ["foo", "bar"], _sockettimeout._GLOBAL_DEFAULT_TIMEOUT, "", None), + ("ftp://localhost/baz.gif;type=a", "localhost", ftplib.FTP_PORT, + "A", [], _sockettimeout._GLOBAL_DEFAULT_TIMEOUT, "baz.gif", +- None), # TODO: really this should guess image/gif ++ "image/gif" if sys.version_info >= (3, 11) else None), + ]: + req = Request(url, timeout=timeout) + r = h.ftp_open(req) diff --git a/dev-python/mechanize/mechanize-0.4.9.ebuild b/dev-python/mechanize/mechanize-0.4.9.ebuild index 9f450d7fd6b3..801db8146541 100644 --- a/dev-python/mechanize/mechanize-0.4.9.ebuild +++ b/dev-python/mechanize/mechanize-0.4.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -29,6 +29,11 @@ BDEPEND=" ) " +PATCHES=( + # https://github.com/python-mechanize/mechanize/pull/95 + "${FILESDIR}/${P}-test.patch" +) + python_test() { - "${EPYTHON}" run_tests.py || die + "${EPYTHON}" run_tests.py -v || die }