commit: 8940ebbd9a73324c4f17a3332271f5e777460690 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Wed Jul 3 14:14:03 2024 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Wed Jul 3 15:55:31 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8940ebbd
dev-python/regex: Remove obsolete pypy3 patches Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> ...regex-2021.4.4-pypy3-fix-test_empty_array.patch | 35 ---------------------- ...regex-2021.4.4-pypy3-fix-test_issue_18468.patch | 31 ------------------- dev-python/regex/regex-2024.5.15.ebuild | 5 ---- 3 files changed, 71 deletions(-) diff --git a/dev-python/regex/files/regex-2021.4.4-pypy3-fix-test_empty_array.patch b/dev-python/regex/files/regex-2021.4.4-pypy3-fix-test_empty_array.patch deleted file mode 100644 index 706b41b74688..000000000000 --- a/dev-python/regex/files/regex-2021.4.4-pypy3-fix-test_empty_array.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: Arthur Zamarin <[email protected]> -Date: Fri, 30 Jul 2021 11:13:41 +0300 -[PATCH] PyPy3: fix test_empty_array - -As an optimization, PyPy sets empty array.array to use a NULL buffer -pointer, while CPython uses empty buffer (but not NULL). -Add a very specially crafted fix for PyPy3 - -Signed-off-by: Arthur Zamarin <[email protected]> ---- - regex_3/_regex.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - ---- a/regex_3/_regex.c -+++ b/regex_3/_regex.c -@@ -18062,9 +18062,19 @@ Py_LOCAL_INLINE(BOOL) get_string(PyObject* string, RE_StringInfo* str_info) { - } - - if (!str_info->view.buf) { -+#if defined(PYPY_VERSION) -+ /* In PyPy3, when the array.array is empty, it's buffer is NULL */ -+ str_info->characters = NULL; -+ str_info->length = 0; -+ str_info->charsize = 1; -+ str_info->is_unicode = FALSE; -+ str_info->should_release = FALSE; -+ return TRUE; -+#else - PyBuffer_Release(&str_info->view); - PyErr_SetString(PyExc_ValueError, "buffer is NULL"); - return FALSE; -+#endif - } - - str_info->should_release = TRUE; diff --git a/dev-python/regex/files/regex-2021.4.4-pypy3-fix-test_issue_18468.patch b/dev-python/regex/files/regex-2021.4.4-pypy3-fix-test_issue_18468.patch deleted file mode 100644 index ae5958021781..000000000000 --- a/dev-python/regex/files/regex-2021.4.4-pypy3-fix-test_issue_18468.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: Arthur Zamarin <[email protected]> -Date: Fri, 30 Jul 2021 11:38:26 +0300 -[PATCH] PyPy3: fix test_issue_18468 - -When using the small subclass classes to test correctness of split -results, there are difference between CPython and PyPy3: - - CPython returns always the base class (for example str instead - of StrSubclass) - - PyPy3 returns the same class, so we get an StrSubclass - -Based on the test, it looks like the behaviour of PyPy3 is correct, -but the test works based on CPython. - -The fix was to relax the equals type to check that it is a subclass. - -Signed-off-by: Arthur Zamarin <[email protected]> ---- - regex_3/test_regex.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/regex_3/test_regex.py -+++ b/regex_3/test_regex.py -@@ -52,7 +52,7 @@ class RegexTests(unittest.TestCase): - for x, y in zip(actual, expect): - recurse(x, y) - else: -- self.assertIs(type(actual), type(expect), msg) -+ self.assertIsInstance(actual, type(expect), msg) - - recurse(actual, expect) - diff --git a/dev-python/regex/regex-2024.5.15.ebuild b/dev-python/regex/regex-2024.5.15.ebuild index dfa0816d714a..120bb6f979d8 100644 --- a/dev-python/regex/regex-2024.5.15.ebuild +++ b/dev-python/regex/regex-2024.5.15.ebuild @@ -22,11 +22,6 @@ SLOT="0" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos" IUSE="doc" -PATCHES=( - "${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_empty_array.patch" - "${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_issue_18468.patch" -) - distutils_enable_tests unittest python_install_all() {
