gentoo resync : 29.12.2022

4 files changed, 87 insertions, 33 deletions

diff --git a/dev-python/mechanize/Manifest b/dev-python/mechanize/Manifest
index 206b116e92f1..43df178ee951 100644
--- a/dev-python/mechanize/Manifest
+++ b/dev-python/mechanize/Manifest
@@ -1,5 +1,4 @@
-DIST mechanize-0.4.7.tar.gz 217289 BLAKE2B 9254cc88141b08bd9f97b63ac1dcb6b417e042cbefcf710ea9e1c340e8f6331ef9301a47bc6dd989970810ef36b97b867b81b3a44c9a4cdf283a77b04f25decd SHA512 f2796f322b1000818bcd4bcedf1d88538ba3a43151b74c950594a60dd7b5cf96ea4fcb605e30c93a5df095da35418401487928b9adfcca932e95dbf964d74c53
+AUX mechanize-0.4.8-python3.11-test-order.patch 3062 BLAKE2B 7aa0734e93931eafe7527c722d5850df39f99225c4d7b173f48799b81f212c730e9ed6e42da3feaa080e0d5ed0f732b2f0d1bebe9dd01b01c5915e295d536495 SHA512 5e4947badd6b25e0788c67d751a71e8a8d46a16ff758a902a5874dd4cd818b9d21f36b5d3363a411b8f5c3a9398227957a35f25f5b92e29fc8127df3b96828e2
 DIST mechanize-0.4.8.tar.gz 218055 BLAKE2B bd91738092ac473ee6e65ee5f175479515f735a0433b112241f17061adf7e60ef6fa410fa549f088390b6ef6c8b2ff95e00335a626322ad170c88923c96e8e44 SHA512 71087481d27359b3ce795eae440ebb3a146f8dd5a6d5ac5dc91ae3c63f2c487beb472aa06b2925d6121faa038a0a8be50f6cecc54ee7209eb2b61e16242ffaa3
-EBUILD mechanize-0.4.7.ebuild 657 BLAKE2B 0771db52d3446f853c5400bc1394708e6c336b021960314ea6cbff890219420f4dd03002eecbf56e1c20d8d9ec136059ed1a608abcf9a03f0a5e364997469a3f SHA512 32cac3c2b5c3ca08206ecebf4249cdb6b6117f6f1a7b2a76e31cbae6e9f0ada5db06520f456428fba84eaadc21bcf73bd72f1b96ba15a84e792c9fa53b96856a
-EBUILD mechanize-0.4.8.ebuild 691 BLAKE2B 4a81c6549c6f6f7441034299e5c1a09a8c7ca0680df9a97666e53407fc2a6e3df9b27e138f27ed357e6d9b2f902e3b472a391bae0ec4d45256619d37aa38d585 SHA512 5e2645a6257fa8c6ef7ab4ec6e4cb0b210a8ddfdf6f8915652a14b8e389fa065d1750ab754fbc92f67fca8b295ed0f9c42455bb5104aef87a7036f936b0ab3ad
+EBUILD mechanize-0.4.8.ebuild 757 BLAKE2B 38d815dad291fefb5cc5b25ca64a2b55435ca790b9ffa6b12dadd425ebff69703920148e6b2a973f7971eb20b856fa5f5d5e1ec34d97d2145407b407bfdd408b SHA512 16e4c8afbcf47a9cc1455b531c878c65e41b71afb8dfd3c45f652cc7be564c6a54b39e5b27fb06395a6c987d10401da4c823752b08b17ba9628d4129846f8345
 MISC metadata.xml 1003 BLAKE2B d841ad699d157456853adb7431fa35aa56e7193696d629bc8ac725f1678b6146249d045f5c411c6ee2a35272f5b9b4cdde157e2cdc7c5bfd2ba06c0a94b001f5 SHA512 0bcc6da1505e523ef5b6e116bca7867d4cbc2cc8d8718071ad2f70077082a70acb970724e337caa3598e0bd663c8a3a5306cfb16b61cfa0fab68b7e86de2602b
diff --git a/dev-python/mechanize/files/mechanize-0.4.8-python3.11-test-order.patch b/dev-python/mechanize/files/mechanize-0.4.8-python3.11-test-order.patch
new file mode 100644
index 000000000000..0808460dcc67
--- /dev/null
+++ b/dev-python/mechanize/files/mechanize-0.4.8-python3.11-test-order.patch
@@ -0,0 +1,79 @@
+https://github.com/python-mechanize/mechanize/commit/529d2c4cb8f31284f8026642968ba3adb9de1171
+https://github.com/python-mechanize/mechanize/commit/7ba3d586368c03577c061c35bc27664a907f5435
+https://github.com/python-mechanize/mechanize/commit/560839d51e54943890c2d37c0d0854792479cb80
+
+From: Kovid Goyal <kovid@kovidgoyal.net>
+Date: Tue, 24 May 2022 11:13:16 +0530
+Subject: [PATCH] Use asserts for failing test so we get better feedback on the
+ failure
+
+--- a/test/test_cookies.py
++++ b/test/test_cookies.py
+@@ -1028,10 +1028,10 @@ def test_Cookie_iterator(self):  # noqa
+             i = 0
+             for c in cs:
+                 # assert isinstance(c, Cookie)
+-                assert c.version == versions[i]
+-                assert c.name == names[i]
+-                assert c.domain == domains[i]
+-                assert c.path == paths[i]
++                self.assertEqual(c.version, versions[i])
++                self.assertEqual(c.name, names[i])
++                self.assertEqual(c.domain, domains[i])
++                self.assertEqual(c.path, paths[i])
+                 i = i + 1
+ 
+         self.assertRaises(IndexError, lambda cs=cs: cs[5])
+
+From: Kovid Goyal <kovid@kovidgoyal.net>
+Date: Tue, 24 May 2022 17:54:50 +0530
+Subject: [PATCH] DRYer
+
+--- a/test/test_cookies.py
++++ b/test/test_cookies.py
+@@ -1025,14 +1025,9 @@ def test_Cookie_iterator(self):  # noqa
+ 
+         # sequential iteration
+         for i in range(4):
+-            i = 0
+-            for c in cs:
++            for c, expected in zip(cs, zip(versions, names, domains, paths)):
+                 # assert isinstance(c, Cookie)
+-                self.assertEqual(c.version, versions[i])
+-                self.assertEqual(c.name, names[i])
+-                self.assertEqual(c.domain, domains[i])
+-                self.assertEqual(c.path, paths[i])
+-                i = i + 1
++                self.assertEqual((c.version, c.name, c.domain, c.path), expected)
+ 
+         self.assertRaises(IndexError, lambda cs=cs: cs[5])
+ 
+Date: Tue, 24 May 2022 18:09:16 +0530
+Subject: [PATCH] Change test to not rely on order of cookie iteration
+
+python 3.11 iterates in add order, earlier pythons iterate in domain
+sorted order
+
+Fix #74
+--- a/test/test_cookies.py
++++ b/test/test_cookies.py
+@@ -1022,13 +1022,12 @@ def test_Cookie_iterator(self):  # noqa
+             "www.acme.com"
+         ]
+         paths = ["/", "/", "/", "/blah", "/blah/"]
+-
++        expected = set(zip(versions, names, domains, paths))
+         # sequential iteration
+-        for i in range(4):
+-            for c, expected in zip(cs, zip(versions, names, domains, paths)):
+-                # assert isinstance(c, Cookie)
+-                self.assertEqual((c.version, c.name, c.domain, c.path), expected)
+-
++        # python 3.11 iterates in add order, earlier pythons iterate in domain
++        # sorted order
++        actual = {(c.version, c.name, c.domain, c.path) for c in cs}
++        self.assertEqual(expected, actual)
+         self.assertRaises(IndexError, lambda cs=cs: cs[5])
+ 
+     def test_parse_ns_headers(self):
+
diff --git a/dev-python/mechanize/mechanize-0.4.7.ebuild b/dev-python/mechanize/mechanize-0.4.7.ebuild
deleted file mode 100644
index 0dbed48e2d13..000000000000
--- a/dev-python/mechanize/mechanize-0.4.7.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Stateful programmatic web browsing in Python"
-HOMEPAGE="https://github.com/python-mechanize/mechanize"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( BSD ZPL )"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/html5lib-0.999999999[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		${RDEPEND}
-	)
-"
-
-python_test() {
-	"${EPYTHON}" run_tests.py || die
-}
diff --git a/dev-python/mechanize/mechanize-0.4.8.ebuild b/dev-python/mechanize/mechanize-0.4.8.ebuild
index 910c92be7113..327456a039dd 100644
--- a/dev-python/mechanize/mechanize-0.4.8.ebuild
+++ b/dev-python/mechanize/mechanize-0.4.8.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 DESCRIPTION="Stateful programmatic web browsing in Python"
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( BSD ZPL )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -24,6 +24,10 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4.8-python3.11-test-order.patch
+)
+
 python_test() {
 	"${EPYTHON}" run_tests.py || die
 }