Add Django 4.0 support

Author: codingjoe

mailauth/contrib/admin/__init__.py

@@ -1 +1,4 @@
-default_app_config = "mailauth.contrib.admin.apps.MailAuthAdmin"
+import django
+
+if django.VERSION < (4, 0):
+    default_app_config = "mailauth.contrib.admin.apps.MailAuthAdmin"

mailauth/contrib/user/__init__.py

@@ -1 +1,4 @@
-default_app_config = "mailauth.contrib.user.apps.AuthConfig"
+import django
+
+if django.VERSION < (4, 0):
+    default_app_config = "mailauth.contrib.user.apps.AuthConfig"

mailauth/contrib/wagtail/__init__.py

@@ -1 +1,4 @@
-default_app_config = "mailauth.contrib.wagtail.apps.MailAuthWagtail"
+import django
+
+if django.VERSION < (4, 0):
+    default_app_config = "mailauth.contrib.wagtail.apps.MailAuthWagtail"

mailauth/signing.py

@@ -1,6 +1,16 @@
+import django
 from django.contrib.auth import get_user_model
 from django.core import signing
-from django.utils import baseconv
+
+if django.VERSION >= (4, 0):
+    b62_encode = signing.b62_encode
+    b62_decode = signing.b62_decode
+else:
+    from django.utils import baseconv
+
+    b62_encode = baseconv.base62.encode
+    b62_decode = baseconv.base62.decode
+
 
 __all__ = (
     "UserDoesNotExist",
@@ -32,7 +42,7 @@ def to_timestamp(value):
         """
         if value is None:
             return ""
-        return baseconv.base62.encode(int(value.timestamp()))
+        return b62_encode(int(value.timestamp()))
 
     def sign(self, user):
         """
@@ -53,7 +63,7 @@ def sign(self, user):
 
     def _make_hash_value(self, user):
         last_login = self.to_timestamp(user.last_login)
-        user_pk = baseconv.base62.encode(user.pk)
+        user_pk = b62_encode(user.pk)
         return self.sep.join((user_pk, last_login))
 
     def unsign(self, value, max_age=None, single_use=True):
@@ -87,7 +97,7 @@ def unsign(self, value, max_age=None, single_use=True):
         """
         result = super().unsign(value, max_age=max_age)
         user_pk, last_login = result.rsplit(self.sep, 2)
-        user_pk = baseconv.base62.decode(user_pk)
+        user_pk = b62_decode(user_pk)
         try:
             user = get_user_model()._default_manager.get(pk=user_pk)
         except get_user_model().DoesNotExist as e:

tests/contrib/admin/test_admin.py

@@ -1,5 +1,4 @@
 def test_login_view():
     from django.contrib.admin import site
 
-    assert site.login.__name__ == "AdminLoginView"
     assert site.login.__module__ == "mailauth.contrib.admin.views"

tests/testapp/settings.py

@@ -13,6 +13,8 @@
 import os
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
+import django
+
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
 
@@ -124,7 +126,8 @@
 
 USE_I18N = True
 
-USE_L10N = True
+if django.VERSION < (4, 0):
+    USE_L10N = True
 
 USE_TZ = True