commit: b1ba63ceb097ae8ef8d39959bee4cbd6e393049b Author: Michael Mair-Keimberger <mm1ke <AT> gentoo <DOT> org> AuthorDate: Thu Feb 12 13:32:02 2026 +0000 Commit: Michael Mair-Keimberger <mm1ke <AT> gentoo <DOT> org> CommitDate: Thu Feb 12 13:32:02 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1ba63ce
dev-python/django: remove unused patches Signed-off-by: Michael Mair-Keimberger <mm1ke <AT> gentoo.org> .../django/files/django-4.2.24-htmlparser.patch | 15 ------- .../django/files/django-5.1-more-pypy3.patch | 51 ---------------------- .../django/files/django-5.2.10-htmlparser.patch | 13 ------ .../django/files/django-5.2.6-htmlparser.patch | 13 ------ 4 files changed, 92 deletions(-) diff --git a/dev-python/django/files/django-4.2.24-htmlparser.patch b/dev-python/django/files/django-4.2.24-htmlparser.patch deleted file mode 100644 index b439a81eb408..000000000000 --- a/dev-python/django/files/django-4.2.24-htmlparser.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/tests/utils_tests/test_html.py b/tests/utils_tests/test_html.py -index f755b8cebc..ef5fe77951 100644 ---- a/tests/utils_tests/test_html.py -+++ b/tests/utils_tests/test_html.py -@@ -101,9 +101,7 @@ class TestUtilsHtml(SimpleTestCase): - (3, 9): (3, 9, 24), - } - py_version = sys.version_info[:2] -- htmlparser_fixed = ( -- py_version in min_fixed and sys.version_info >= min_fixed[py_version] -- ) -+ htmlparser_fixed = True - items = ( - ( - "<p>See: 'é is an apostrophe followed by e acute</p>", diff --git a/dev-python/django/files/django-5.1-more-pypy3.patch b/dev-python/django/files/django-5.1-more-pypy3.patch deleted file mode 100644 index 27663898cc55..000000000000 --- a/dev-python/django/files/django-5.1-more-pypy3.patch +++ /dev/null @@ -1,51 +0,0 @@ -From d9aeb23edb6cc861360ffbb59a45beccafe55dcb Mon Sep 17 00:00:00 2001 -From: Mariusz Felisiak <[email protected]> -Date: Thu, 8 Aug 2024 08:13:29 +0200 -Subject: [PATCH] [5.1.x] Fixed #35661 -- Fixed - test_too_many_digits_to_rander() test crash on PyPy. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Thanks Michał Górny for the report. - -Backport of 7fb15ad5bcae05324ee8913e4b2c6c982e8f2de0 from main. ---- - .../template_tests/filter_tests/test_floatformat.py | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - -diff --git a/tests/template_tests/filter_tests/test_floatformat.py b/tests/template_tests/filter_tests/test_floatformat.py -index 3d6c34a55232..6183f6a0691d 100644 ---- a/tests/template_tests/filter_tests/test_floatformat.py -+++ b/tests/template_tests/filter_tests/test_floatformat.py -@@ -4,6 +4,7 @@ - from django.test import SimpleTestCase - from django.utils import translation - from django.utils.safestring import mark_safe -+from django.utils.version import PYPY - - from ..utils import setup - -@@ -181,12 +182,21 @@ def test_too_many_digits_to_render(self): - "-1E10000000000000000", - "1e10000000000000000", - "-1e10000000000000000", -- "1" + "0" * 1_000_000, - ] - for value in cases: - with self.subTest(value=value): - self.assertEqual(floatformat(value), value) - -+ def test_too_many_digits_to_render_very_long(self): -+ value = "1" + "0" * 1_000_000 -+ if PYPY: -+ # PyPy casts decimal parts to int, which reaches the integer string -+ # conversion length limit (default 4300 digits, CVE-2020-10735). -+ with self.assertRaises(ValueError): -+ floatformat(value) -+ else: -+ self.assertEqual(floatformat(value), value) -+ - def test_float_dunder_method(self): - class FloatWrapper: - def __init__(self, value): diff --git a/dev-python/django/files/django-5.2.10-htmlparser.patch b/dev-python/django/files/django-5.2.10-htmlparser.patch deleted file mode 100644 index 5d9bec30539d..000000000000 --- a/dev-python/django/files/django-5.2.10-htmlparser.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/tests/utils_tests/test_html.py b/tests/utils_tests/test_html.py -index 89c97cee03..776409fac8 100644 ---- a/tests/utils_tests/test_html.py -+++ b/tests/utils_tests/test_html.py -@@ -155,6 +155,8 @@ class TestUtilsHtml(SimpleTestCase): - sys.version_info - >= min_fixed_incomplete_entities.get(major_version, major_version) - ) -+ # Gentoo: patches backported -+ htmlparser_fixed = True - items = ( - ( - "<p>See: 'é is an apostrophe followed by e acute</p>", diff --git a/dev-python/django/files/django-5.2.6-htmlparser.patch b/dev-python/django/files/django-5.2.6-htmlparser.patch deleted file mode 100644 index 546dbaca7504..000000000000 --- a/dev-python/django/files/django-5.2.6-htmlparser.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/tests/utils_tests/test_html.py b/tests/utils_tests/test_html.py -index 681071bf03..3744f5bdfb 100644 ---- a/tests/utils_tests/test_html.py -+++ b/tests/utils_tests/test_html.py -@@ -132,7 +132,7 @@ class TestUtilsHtml(SimpleTestCase): - (3, 10): (3, 10, 19), - (3, 9): (3, 9, 24), - } -- htmlparser_fixed = sys.version_info >= min_fixed[sys.version_info[:2]] -+ htmlparser_fixed = True - items = ( - ( - "<p>See: 'é is an apostrophe followed by e acute</p>",
