Remove Django EOL version copat code

Author: codingjoe

mailauth/contrib/admin/__init__.py

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

mailauth/contrib/user/__init__.py

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

mailauth/contrib/wagtail/__init__.py

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

mailauth/signing.py

@@ -1,17 +1,6 @@
-import django
 from django.contrib.auth import get_user_model
 from django.core import signing
 
-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",
     "UserSigner",
@@ -39,7 +28,7 @@ def to_timestamp(value):
         """
         if value is None:
             return ""
-        return b62_encode(int(value.timestamp()))
+        return signing.b62_encode(int(value.timestamp()))
 
     def sign(self, user):
         """
@@ -60,7 +49,7 @@ def sign(self, user):
 
     def _make_hash_value(self, user):
         last_login = self.to_timestamp(user.last_login)
-        user_pk = b62_encode(user.pk)
+        user_pk = signing.b62_encode(user.pk)
         return self.sep.join((user_pk, last_login))
 
     def unsign(self, value, max_age=None, single_use=True):
@@ -94,7 +83,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 = b62_decode(user_pk)
+        user_pk = signing.b62_decode(user_pk)
         try:
             user = get_user_model()._default_manager.get(pk=user_pk)
         except get_user_model().DoesNotExist as e:

setup.cfg

@@ -28,7 +28,7 @@ keywords = django, otp, password, email
 include_package_data = True
 packages = find:
 install_requires =
-    django>=2.2
+    django>=4.0
 setup_requires =
     setuptools_scm
     sphinx

tests/conftest.py

@@ -1,4 +1,3 @@
-import django
 import pytest
 from django.contrib.auth import get_user_model
 from django.utils import timezone
@@ -37,8 +36,6 @@ def admin_user(db):
 @pytest.fixture()
 def signature():
     """Return a signature matching the user fixture."""
-    if django.VERSION < (3, 1):
-        return "LZ:173QUS:1Hjptg:umUR9iKN1rxDezT-dZGwqcqsM5Y"
     return "LZ:173QUS:1Hjptg:6oq5DS1NJ7SxJ1o-CpfgaqrImVaRpkcHrzV9yltwcHM"
 
 

tests/contrib/auth/test_models.py

@@ -1,4 +1,3 @@
-import django
 import pytest
 from django.core.exceptions import FieldDoesNotExist
 
@@ -29,14 +28,12 @@ def test_get_session_auth_hash__unique(self, db):
 
         assert spiderman.get_session_auth_hash() != ironman.get_session_auth_hash()
 
-    @pytest.mark.skipif(django.VERSION < (3, 1), reason="requires Django 3.1 or higher")
     def test_legacy_get_session_auth_hash__default(self, db):
         user = EmailUser(email="spiderman@avengers.com")
 
         assert user.session_salt
         assert user._legacy_get_session_auth_hash()
 
-    @pytest.mark.skipif(django.VERSION < (3, 1), reason="requires Django 3.1 or higher")
     def test_legacy_get_session_auth_hash__value_error(self, db):
         user = EmailUser(email="spiderman@avengers.com", session_salt=None)
 
@@ -45,7 +42,6 @@ def test_legacy_get_session_auth_hash__value_error(self, db):
 
         assert "'session_salt' must be set" in str(e.value)
 
-    @pytest.mark.skipif(django.VERSION < (3, 1), reason="requires Django 3.1 or higher")
     def test_legacy_get_session_auth_hash__unique(self, db):
         spiderman = EmailUser(email="spiderman@avengers.com")
         ironman = EmailUser(email="ironman@avengers.com")

tests/testapp/settings.py

@@ -13,7 +13,6 @@
 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__)))
 
@@ -125,10 +124,6 @@
 TIME_ZONE = "UTC"
 
 USE_I18N = True
-
-if django.VERSION < (4, 0):
-    USE_L10N = True
-
 USE_TZ = True