From 78b1ecb39d4cb32507d772eaca69a011628fd38e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 25 Jan 2025 20:59:47 +0100 Subject: [PATCH] python313Packages.django-polymorphic: fix django 5.1 compat --- .../django-polymorphic/default.nix | 5 +++++ .../django-5.1-compat.patch | 22 +++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/django-polymorphic/django-5.1-compat.patch diff --git a/pkgs/development/python-modules/django-polymorphic/default.nix b/pkgs/development/python-modules/django-polymorphic/default.nix index 1f1aee7a7df8..ff2682c6d3e7 100644 --- a/pkgs/development/python-modules/django-polymorphic/default.nix +++ b/pkgs/development/python-modules/django-polymorphic/default.nix @@ -21,6 +21,11 @@ buildPythonPackage rec { hash = "sha256-cEV9gnc9gLpAVmYkzSaQwDbgXsklMTq71edndDJeP9E="; }; + patches = [ + # https://github.com/jazzband/django-polymorphic/issues/616 + ./django-5.1-compat.patch + ]; + build-system = [ setuptools ]; dependencies = [ django ]; diff --git a/pkgs/development/python-modules/django-polymorphic/django-5.1-compat.patch b/pkgs/development/python-modules/django-polymorphic/django-5.1-compat.patch new file mode 100644 index 000000000000..42976118728a --- /dev/null +++ b/pkgs/development/python-modules/django-polymorphic/django-5.1-compat.patch @@ -0,0 +1,22 @@ +From a2c48cedc45db52469b93b6fa7a5d50c6722586f Mon Sep 17 00:00:00 2001 +From: Ben Gosney +Date: Sun, 25 Aug 2024 14:49:33 +0100 +Subject: [PATCH] fix(query): handle None + +--- + polymorphic/query.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/polymorphic/query.py b/polymorphic/query.py +index 8e93281a..2d2df6c3 100644 +--- a/polymorphic/query.py ++++ b/polymorphic/query.py +@@ -278,7 +278,7 @@ def tree_node_test___lookup(my_model, node): + elif hasattr(a, "get_source_expressions"): + for source_expression in a.get_source_expressions(): + test___lookup(source_expression) +- else: ++ elif a is not None: + assert "___" not in a.name, ___lookup_assert_msg + + for a in args: