Support Django 4

demo/demo/urls.py

@@ -1,9 +1,11 @@
-from django.conf.urls import include, url
+from django.conf.urls import include
 from django.contrib import admin
 from django.views.generic import TemplateView, RedirectView
 
 from rest_framework_swagger.views import get_swagger_view
 
+from rest_auth.four import url
+
 urlpatterns = [
     url(r'^$', TemplateView.as_view(template_name="home.html"), name='home'),
     url(r'^signup/$', TemplateView.as_view(template_name="signup.html"),

rest_auth/four.py

@@ -0,0 +1,17 @@
+try:
+    from django.conf.urls import url
+except ImportError:
+    # Compatibility for Django 4.
+    from django.urls import re_path as url
+
+try:
+    from django.utils.translation import ugettext_lazy
+except ImportError:
+    # Compatibility for Django 4.
+    from django.utils.translation import gettext_lazy as ugettext_lazy
+
+try:
+    from django.utils.encoding import force_text
+except ImportError:
+    # Compatibility for Django 4.
+    from django.utils.encoding import force_str as force_text

rest_auth/registration/serializers.py

@@ -1,5 +1,4 @@
 from django.http import HttpRequest
-from django.utils.translation import ugettext_lazy as _
 from django.contrib.auth import get_user_model
 
 try:
@@ -17,6 +16,7 @@
 from rest_framework import serializers
 from requests.exceptions import HTTPError
 
+from rest_auth.four import ugettext_lazy as _
 
 class SocialAccountSerializer(serializers.ModelSerializer):
     """

rest_auth/registration/urls.py

@@ -1,12 +1,11 @@
 from django.views.generic import TemplateView
-from django.conf.urls import url
 
 from .views import (
     RegisterView,
     VerifyEmailView,
     ResendConfirmationEmailView,
 )
-
+from rest_auth.four import url
 
 urlpatterns = [
     url(r'^$', RegisterView.as_view(), name='rest_register'),

rest_auth/registration/views.py

@@ -2,7 +2,6 @@
 
 from django.conf import settings
 from django.utils.decorators import method_decorator
-from django.utils.translation import ugettext_lazy as _
 from django.views.decorators.debug import sensitive_post_parameters
 
 from rest_framework.views import APIView
@@ -25,6 +24,7 @@
 from rest_auth.app_settings import (TokenSerializer,
                                     JWTSerializer,
                                     create_token)
+from rest_auth.four import ugettext_lazy as _
 from rest_auth.models import TokenModel
 from rest_auth.registration.serializers import (
     VerifyEmailSerializer,

rest_auth/serializers.py

@@ -3,12 +3,12 @@
 from django.contrib.auth.forms import PasswordResetForm, SetPasswordForm
 from django.contrib.auth.tokens import default_token_generator
 from django.utils.http import urlsafe_base64_decode as uid_decoder
-from django.utils.translation import ugettext_lazy as _
-from django.utils.encoding import force_text
 
 from rest_framework import serializers, exceptions
 from rest_framework.exceptions import ValidationError
 
+from .four import force_text
+from .four import ugettext_lazy as _
 from .models import TokenModel
 from .utils import import_callable
 

rest_auth/tests/mixins.py

@@ -2,7 +2,6 @@
 
 from django.conf import settings
 from django.test.client import Client, MULTIPART_CONTENT
-from django.utils.encoding import force_text
 
 from rest_framework import status
 from rest_framework import permissions
@@ -12,6 +11,7 @@
 except ImportError:
     from django.core.urlresolvers import reverse
 
+from rest_auth.four import force_text
 
 class CustomPermissionClass(permissions.BasePermission):
     message = 'You shall not pass!'

rest_auth/tests/test_api.py

@@ -2,13 +2,13 @@
 from django.contrib.auth import get_user_model
 from django.core import mail
 from django.conf import settings
-from django.utils.encoding import force_text
 
 from allauth.account import app_settings as account_app_settings
 from allauth.account.models import EmailAddress
 from rest_framework import status
 from rest_framework.test import APIRequestFactory
 
+from rest_auth.four import force_text
 from rest_auth.registration.views import RegisterView
 from rest_auth.registration.app_settings import register_permission_classes
 

rest_auth/urls.py

@@ -1,5 +1,4 @@
-from django.conf.urls import url
-
+from rest_auth.four import url
 from rest_auth.views import (
     LoginView, LogoutView, UserDetailsView, PasswordChangeView,
     PasswordResetView, PasswordResetConfirmView

rest_auth/views.py

@@ -7,7 +7,6 @@
 from django.contrib.auth.signals import user_logged_in
 from django.core.exceptions import ObjectDoesNotExist
 from django.utils.decorators import method_decorator
-from django.utils.translation import ugettext_lazy as _
 from django.views.decorators.debug import sensitive_post_parameters
 
 from rest_framework import status
@@ -21,6 +20,7 @@
     PasswordResetSerializer, PasswordResetConfirmSerializer,
     PasswordChangeSerializer, JWTSerializer, create_token
 )
+from .four import ugettext_lazy as _
 from .models import TokenModel
 from .utils import jwt_encode