Added django 4.0 compatibility.

tests/test_models.py

@@ -2,9 +2,9 @@
 
 from django.conf import settings
 from django.test import TransactionTestCase
-from django.utils.encoding import force_text
 
 from treenode.cache import clear_cache
+from treenode.compat import force_str
 from treenode.utils import join_pks
 
 from .models import (
@@ -317,19 +317,19 @@ def test_get_display(self):
         o = self.__create_cat(name='ò', parent=i)
         u = self.__create_cat(name='ù', parent=o)
         opts = {'indent': False, 'mark': '- '}
-        self.assertEqual(a.get_display(**opts), force_text('à'))
-        self.assertEqual(c.get_display(**opts), force_text('ç'))
-        self.assertEqual(e.get_display(**opts), force_text('è'))
-        self.assertEqual(i.get_display(**opts), force_text('ì'))
-        self.assertEqual(o.get_display(**opts), force_text('ò'))
-        self.assertEqual(u.get_display(**opts), force_text('ù'))
+        self.assertEqual(a.get_display(**opts), force_str('à'))
+        self.assertEqual(c.get_display(**opts), force_str('ç'))
+        self.assertEqual(e.get_display(**opts), force_str('è'))
+        self.assertEqual(i.get_display(**opts), force_str('ì'))
+        self.assertEqual(o.get_display(**opts), force_str('ò'))
+        self.assertEqual(u.get_display(**opts), force_str('ù'))
         opts = {'indent': True, 'mark': '- '}
-        self.assertEqual(a.get_display(**opts), force_text('à'))
-        self.assertEqual(c.get_display(**opts), force_text('- ç'))
-        self.assertEqual(e.get_display(**opts), force_text('- - è'))
-        self.assertEqual(i.get_display(**opts), force_text('- - - ì'))
-        self.assertEqual(o.get_display(**opts), force_text('- - - - ò'))
-        self.assertEqual(u.get_display(**opts), force_text('- - - - - ù'))
+        self.assertEqual(a.get_display(**opts), force_str('à'))
+        self.assertEqual(c.get_display(**opts), force_str('- ç'))
+        self.assertEqual(e.get_display(**opts), force_str('- - è'))
+        self.assertEqual(i.get_display(**opts), force_str('- - - ì'))
+        self.assertEqual(o.get_display(**opts), force_str('- - - - ò'))
+        self.assertEqual(u.get_display(**opts), force_str('- - - - - ù'))
 
     def test_get_first_child(self):
         self.__create_cat_tree()

tests/test_performance.py

@@ -2,11 +2,8 @@
 
 from django.conf import settings
 from django.test import TransactionTestCase
-# from django.utils.encoding import force_text
 
-# from treenode.cache import clear_cache
 from treenode.debug import debug_performance
-# from treenode.utils import join_pks, split_pks
 from treenode.signals import no_signals
 
 from .models import Category

tox.ini

@@ -5,7 +5,7 @@ envlist =
     py37-{dj20,dj21,dj22,dj30,dj31,dj32}-{sqlite,postgres},
     py38-{dj22,dj30,dj31,dj32}-{sqlite,postgres},
     py39-{dj22,dj30,dj31,dj32}-{sqlite,postgres},
-    py310-{dj32}-{sqlite,postgres},
+    py310-{dj32,dj40}-{sqlite,postgres},
 
 [gh-actions]
 python =
@@ -29,6 +29,7 @@ deps =
     dj30: Django == 3.0.*
     dj31: Django == 3.1.*
     dj32: Django == 3.2.*
+    dj40: Django == 4.0.*
     # mysql: mysqlclient
     postgres: psycopg2-binary
     coverage

treenode/compat.py

@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+
+import django
+
+if django.VERSION >= (3, 0):
+    from django.utils.encoding import force_str
+else:
+    from django.utils.encoding import force_text as force_str

treenode/models.py

@@ -4,14 +4,14 @@
 
 from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models, transaction
-from django.utils.encoding import force_text
 from django.utils.text import slugify
 from django.utils.translation import gettext_lazy as _
 
 from six import python_2_unicode_compatible
 
 from . import classproperty
 from .cache import clear_cache, query_cache, update_cache
+from .compat import force_str
 from .debug import debug_performance
 from .memory import clear_refs, update_refs
 from .signals import connect_signals, no_signals
@@ -201,9 +201,9 @@ def get_descendants_tree_display(self, cache=True):
 
     def get_display(self, indent=True, mark='— '):
         indentation = (mark * self.tn_ancestors_count) if indent else ''
-        indentation = force_text(indentation)
+        indentation = force_str(indentation)
         text = self.get_display_text()
-        text = force_text(text)
+        text = force_str(text)
         return indentation + text
 
     def get_display_text(self):
@@ -219,7 +219,7 @@ def get_display_text(self):
             text = getattr(self, field_name, '')
         if not text and self.pk:
             text = self.pk
-        return force_text(text)
+        return force_str(text)
 
     def get_first_child(self, cache=True):
         return self.get_children(cache=cache)[0] \