Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/mechanize/, dev-python/mechanize/files/
Date: Tue, 05 Oct 2021 08:27:35
Message-Id: 1633422430.536aa64eb590c7091f8e8105626ad1593af7d0de.mgorny@gentoo
1 commit: 536aa64eb590c7091f8e8105626ad1593af7d0de
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Tue Oct 5 06:57:03 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Oct 5 08:27:10 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=536aa64e
7
8 dev-python/mechanize: Remove old
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 dev-python/mechanize/Manifest | 1 -
13 .../mechanize/files/mechanize-0.4.5-py310.patch | 28 -----------------
14 dev-python/mechanize/mechanize-0.4.5-r1.ebuild | 35 ----------------------
15 3 files changed, 64 deletions(-)
16
17 diff --git a/dev-python/mechanize/Manifest b/dev-python/mechanize/Manifest
18 index 1914c91de72..d13c8e51f20 100644
19 --- a/dev-python/mechanize/Manifest
20 +++ b/dev-python/mechanize/Manifest
21 @@ -1,3 +1,2 @@
22 -DIST mechanize-0.4.5.tar.gz 216908 BLAKE2B 67951ad8295a32799768b3719525d45d502bc773c6f2a5e762e3dae97f309c8c265a2cb3efde95c9e8cb65e89dee6ad6ad8585685baa4e9ff1acfd146f115f6f SHA512 51706d5c073501d02fb7395eda30625ed9191324f948073c7d1589df0e507d8b7641ca514ceff55e7d82e899ba6e10c55507c79668976c7654ff0004671d09d2
23 DIST mechanize-0.4.6.tar.gz 217254 BLAKE2B 0adc7e0bcbef93051412d0d22e9f426984e197791b43b007087d70d3b15d4fce2f4868e8ad520e8621d35890d6454bd9bfc0910dc5af3d640e2620de4f536e16 SHA512 c28ba59529d2a1d4454467c1e034fc583952fd152c8f889bf9b4c496ad4567e9ca5f8b133eb6eb081bc1e811f54c508e47f8a2c5ccdd8f04c709dafeedf05820
24 DIST mechanize-0.4.7.tar.gz 217289 BLAKE2B 9254cc88141b08bd9f97b63ac1dcb6b417e042cbefcf710ea9e1c340e8f6331ef9301a47bc6dd989970810ef36b97b867b81b3a44c9a4cdf283a77b04f25decd SHA512 f2796f322b1000818bcd4bcedf1d88538ba3a43151b74c950594a60dd7b5cf96ea4fcb605e30c93a5df095da35418401487928b9adfcca932e95dbf964d74c53
25
26 diff --git a/dev-python/mechanize/files/mechanize-0.4.5-py310.patch b/dev-python/mechanize/files/mechanize-0.4.5-py310.patch
27 deleted file mode 100644
28 index 98656b65425..00000000000
29 --- a/dev-python/mechanize/files/mechanize-0.4.5-py310.patch
30 +++ /dev/null
31 @@ -1,28 +0,0 @@
32 -diff --git a/mechanize/_clientcookie.py b/mechanize/_clientcookie.py
33 -index ebd2773..6c89cbf 100644
34 ---- a/mechanize/_clientcookie.py
35 -+++ b/mechanize/_clientcookie.py
36 -@@ -188,13 +188,22 @@ class CookieJar(CJ):
37 - raise IndexError()
38 -
39 -
40 -+try:
41 -+ from http.cookiejar import NETSCAPE_MAGIC_RGX, NETSCAPE_HEADER_TEXT
42 -+except ImportError: # python < 3.10
43 -+ NETSCAPE_MAGIC_RGX = MCJ.magic_re
44 -+ NETSCAPE_HEADER_TEXT = MCJ.header
45 -+else:
46 -+ MCJ.header = NETSCAPE_HEADER_TEXT # needed for tests
47 -+
48 -+
49 - class MozillaCookieJar(MCJ):
50 -
51 - def _really_load(self, f, filename, ignore_discard, ignore_expires):
52 - now = time.time()
53 -
54 - magic = f.readline()
55 -- if not re.search(self.magic_re, magic):
56 -+ if not re.search(NETSCAPE_MAGIC_RGX, magic):
57 - f.close()
58 - raise LoadError(
59 - "%r does not look like a Netscape format cookies file" %
60
61 diff --git a/dev-python/mechanize/mechanize-0.4.5-r1.ebuild b/dev-python/mechanize/mechanize-0.4.5-r1.ebuild
62 deleted file mode 100644
63 index 50942d696a0..00000000000
64 --- a/dev-python/mechanize/mechanize-0.4.5-r1.ebuild
65 +++ /dev/null
66 @@ -1,35 +0,0 @@
67 -# Copyright 1999-2021 Gentoo Authors
68 -# Distributed under the terms of the GNU General Public License v2
69 -
70 -EAPI=8
71 -
72 -PYTHON_COMPAT=( python3_{7..10} )
73 -
74 -inherit distutils-r1
75 -
76 -DESCRIPTION="Stateful programmatic web browsing in Python"
77 -HOMEPAGE="https://github.com/python-mechanize/mechanize"
78 -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
79 -
80 -LICENSE="|| ( BSD ZPL )"
81 -SLOT="0"
82 -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
83 -IUSE="test"
84 -RESTRICT="!test? ( test )"
85 -
86 -RDEPEND=">=dev-python/html5lib-0.999999999[${PYTHON_USEDEP}]"
87 -BDEPEND="
88 - test? (
89 - ${RDEPEND}
90 - )
91 -"
92 -
93 -PATCHES=(
94 - # https://github.com/python-mechanize/mechanize/commit/2a563ec4fbc394ec5976dda0f528db43d28a2706
95 - # https://github.com/python-mechanize/mechanize/commit/bc6a2ca7b17e11f2533ada67f0bf92124d4a3cac
96 - "${FILESDIR}/${P}-py310.patch"
97 -)
98 -
99 -python_test() {
100 - "${EPYTHON}" run_tests.py || die
101 -}