perf: 修改支持 Django4

apps/authentication/views/base.py

@@ -1,26 +1,23 @@
 from functools import lru_cache
 
-from rest_framework.request import Request
-from django.utils.translation import ugettext_lazy as _
-from django.utils.module_loading import import_string
 from django.conf import settings
 from django.db.utils import IntegrityError
+from django.utils.module_loading import import_string
+from django.utils.translation import gettext_lazy as _
 from django.views import View
+from rest_framework.request import Request
 
 from authentication import errors
 from authentication.mixins import AuthMixin
-from users.models import User
-from common.utils.django import reverse, get_object_or_none
 from common.utils import get_logger
-
+from common.utils.django import reverse, get_object_or_none
+from users.models import User
 from .mixins import FlashMessageMixin
 
-
 logger = get_logger(__file__)
 
 
 class BaseLoginCallbackView(AuthMixin, FlashMessageMixin, View):
-
     client_type_path = ''
     client_auth_params = {}
     user_type = ''

apps/authentication/views/dingtalk.py

@@ -4,7 +4,7 @@ from django.conf import settings
 from django.db.utils import IntegrityError
 from django.http.request import HttpRequest
 from django.http.response import HttpResponseRedirect
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.views import View
 from rest_framework.exceptions import APIException
 from rest_framework.permissions import AllowAny, IsAuthenticated
@@ -13,16 +13,15 @@ from authentication import errors
 from authentication.const import ConfirmType
 from authentication.mixins import AuthMixin
 from authentication.notifications import OAuthBindMessage
-from common.views.mixins import PermissionsMixin, UserConfirmRequiredExceptionMixin
 from common.permissions import UserConfirmation
 from common.sdk.im.dingtalk import URL, DingTalk
 from common.utils import get_logger
 from common.utils.common import get_request_ip
 from common.utils.django import get_object_or_none, reverse
 from common.utils.random import random_string
+from common.views.mixins import PermissionsMixin, UserConfirmRequiredExceptionMixin
 from users.models import User
 from users.views import UserVerifyPasswordView
-
 from .base import BaseLoginCallbackView
 from .mixins import METAMixin, FlashMessageMixin
 

apps/authentication/views/feishu.py

@@ -4,22 +4,21 @@ from django.conf import settings
 from django.db.utils import IntegrityError
 from django.http.request import HttpRequest
 from django.http.response import HttpResponseRedirect
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.views import View
 from rest_framework.exceptions import APIException
 from rest_framework.permissions import AllowAny, IsAuthenticated
 
 from authentication.const import ConfirmType
 from authentication.notifications import OAuthBindMessage
-from common.views.mixins import PermissionsMixin, UserConfirmRequiredExceptionMixin
 from common.permissions import UserConfirmation
 from common.sdk.im.feishu import URL, FeiShu
 from common.utils import get_logger
 from common.utils.common import get_request_ip
 from common.utils.django import reverse
 from common.utils.random import random_string
+from common.views.mixins import PermissionsMixin, UserConfirmRequiredExceptionMixin
 from users.views import UserVerifyPasswordView
-
 from .base import BaseLoginCallbackView
 from .mixins import FlashMessageMixin
 
@@ -166,4 +165,3 @@ class FeiShuQRLoginCallbackView(FeiShuQRMixin, BaseLoginCallbackView):
     msg_client_err = _('FeiShu Error')
     msg_user_not_bound_err = _('FeiShu is not bound')
     msg_not_found_user_from_client_err = _('Failed to get user from FeiShu')
-

apps/authentication/views/login.py

@@ -16,7 +16,7 @@ from django.shortcuts import reverse, redirect
 from django.templatetags.static import static
 from django.urls import reverse_lazy
 from django.utils.decorators import method_decorator
-from django.utils.translation import ugettext as _, get_language
+from django.utils.translation import gettext as _, get_language
 from django.views.decorators.cache import never_cache
 from django.views.decorators.csrf import csrf_protect
 from django.views.decorators.debug import sensitive_post_parameters

apps/authentication/views/wecom.py

@@ -1,28 +1,28 @@
-from django.http.response import HttpResponseRedirect
-from django.utils.translation import ugettext_lazy as _
 from urllib.parse import urlencode
-from django.views import View
-from django.conf import settings
-from django.http.request import HttpRequest
-from django.db.utils import IntegrityError
-from rest_framework.permissions import IsAuthenticated, AllowAny
-from rest_framework.exceptions import APIException
 
-from users.models import User
-from users.views import UserVerifyPasswordView
-from common.utils import get_logger
-from common.utils.random import random_string
-from common.utils.django import reverse, get_object_or_none
+from django.conf import settings
+from django.db.utils import IntegrityError
+from django.http.request import HttpRequest
+from django.http.response import HttpResponseRedirect
+from django.utils.translation import gettext_lazy as _
+from django.views import View
+from rest_framework.exceptions import APIException
+from rest_framework.permissions import IsAuthenticated, AllowAny
+
+from authentication import errors
+from authentication.const import ConfirmType
+from authentication.mixins import AuthMixin
+from authentication.notifications import OAuthBindMessage
+from common.permissions import UserConfirmation
 from common.sdk.im.wecom import URL
 from common.sdk.im.wecom import WeCom
-from common.views.mixins import UserConfirmRequiredExceptionMixin, PermissionsMixin
+from common.utils import get_logger
 from common.utils.common import get_request_ip
-from common.permissions import UserConfirmation
-from authentication import errors
-from authentication.mixins import AuthMixin
-from authentication.const import ConfirmType
-from authentication.notifications import OAuthBindMessage
-
+from common.utils.django import reverse, get_object_or_none
+from common.utils.random import random_string
+from common.views.mixins import UserConfirmRequiredExceptionMixin, PermissionsMixin
+from users.models import User
+from users.views import UserVerifyPasswordView
 from .base import BaseLoginCallbackView
 from .mixins import METAMixin, FlashMessageMixin