From 6d3dcbce79a30772ec9ce48fdfede258513c313a Mon Sep 17 00:00:00 2001 From: Gyorgy Sarvari Date: Thu, 15 Jan 2026 09:29:10 +0100 Subject: python3-django: handle non-existing import from CVE patch This change is for python3-django_2.2.28. During backporting a patch for CVE-2024-56374, an import got into the patch for v2.2.28 that does not exist yet in that version. This patch handles this import with a fallback to prevent throwing and ImportError. Signed-off-by: Gyorgy Sarvari --- .../python/python3-django/0001-fix-ipv6-test.patch | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 meta-python/recipes-devtools/python/python3-django/0001-fix-ipv6-test.patch (limited to 'meta-python/recipes-devtools/python/python3-django/0001-fix-ipv6-test.patch') diff --git a/meta-python/recipes-devtools/python/python3-django/0001-fix-ipv6-test.patch b/meta-python/recipes-devtools/python/python3-django/0001-fix-ipv6-test.patch new file mode 100644 index 0000000000..57f2a073cc --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-django/0001-fix-ipv6-test.patch @@ -0,0 +1,34 @@ +From b56516c12f05cf56e65cc960f865d5ebdae733e2 Mon Sep 17 00:00:00 2001 +From: Gyorgy Sarvari +Date: Wed, 14 Jan 2026 11:05:36 +0100 +Subject: [PATCH] fix ipv6 test + +During backporting a patch for CVE-2024-56374, an import got into +the patch for v2.2.28 that does not exist yet in that version. + +This patch handles this import with a fallback to prevent throwing +and ImportError. + +Upstream-Status: Inappropriate [Backport specific] +Signed-off-by: Gyorgy Sarvari +--- + tests/utils_tests/test_ipv6.py | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/tests/utils_tests/test_ipv6.py b/tests/utils_tests/test_ipv6.py +index 1ac6763..3b21948 100644 +--- a/tests/utils_tests/test_ipv6.py ++++ b/tests/utils_tests/test_ipv6.py +@@ -8,8 +8,10 @@ from django.utils.ipv6 import ( + clean_ipv6_address, + is_valid_ipv6_address, + ) +-from django.utils.version import PY310 +- ++try: ++ from django.utils.version import PY310 ++except ImportError: ++ PY310 = None + + class TestUtilsIPv6(SimpleTestCase): + -- cgit v1.2.3-54-g00ecf