Merge pull request #234 from sn1c/update_for_django_4

Update for Django 4
etianen · Dec 8, 2021 · 5be47f7 · 5be47f7
2 parents b8c8111 + 047d68b
commit 5be47f7
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/django_python3_ldap/utils.py b/django_python3_ldap/utils.py
@@ -6,7 +6,11 @@
 import binascii
 import itertools
 
-from django.utils.encoding import force_text
+try:
+    from django.utils.encoding import force_str
+except ImportError:
+    from django.utils.encoding import force_text as force_str
+
 from django.utils.module_loading import import_string
 
 from django_python3_ldap.conf import settings
@@ -27,8 +31,8 @@ def clean_ldap_name(name):
     """
     return re.sub(
         r'[^a-zA-Z0-9 _\-.@:*]',
-        lambda c: "\\" + force_text(binascii.hexlify(c.group(0).encode("latin-1", errors="ignore"))).upper(),
-        force_text(name),
+        lambda c: "\\" + force_str(binascii.hexlify(c.group(0).encode("latin-1", errors="ignore"))).upper(),
+        force_str(name),
     )