From 1ad0a2062717c8fe58320903cabfe4addbb5e64a Mon Sep 17 00:00:00 2001
From: fit2bot <68588906+fit2bot@users.noreply.github.com>
Date: Mon, 31 Jul 2023 18:31:11 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=90=AF=E5=8A=A8500=20(#11133)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: feng <1304903146@qq.com>
---
 apps/accounts/const/vault.py         | 2 +-
 apps/accounts/models/mixins/vault.py | 2 +-
 apps/common/db/utils.py              | 4 ++--
 apps/settings/serializers/vault.py   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/accounts/const/vault.py b/apps/accounts/const/vault.py
index 8b30b8afa..1da2a591b 100644
--- a/apps/accounts/const/vault.py
+++ b/apps/accounts/const/vault.py
@@ -1,5 +1,5 @@
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 __all__ = ['VaultTypeChoices']
 
diff --git a/apps/accounts/models/mixins/vault.py b/apps/accounts/models/mixins/vault.py
index 95c85265d..a551f20aa 100644
--- a/apps/accounts/models/mixins/vault.py
+++ b/apps/accounts/models/mixins/vault.py
@@ -1,6 +1,6 @@
 from django.db import models
 from django.db.models.signals import post_save
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from common.db import fields
 
diff --git a/apps/common/db/utils.py b/apps/common/db/utils.py
index 23197a4f9..69c82e583 100644
--- a/apps/common/db/utils.py
+++ b/apps/common/db/utils.py
@@ -1,7 +1,7 @@
 from contextlib import contextmanager
 
 from django.db import connections
-from django.utils.encoding import force_text
+from django.utils.encoding import force_str
 
 from common.utils import get_logger, signer, crypto
 
@@ -60,7 +60,7 @@ def safe_db_connection():
 
 class Encryptor:
     def __init__(self, value):
-        self.value = force_text(value)
+        self.value = force_str(value)
 
     def decrypt(self):
         plain_value = crypto.decrypt(self.value)
diff --git a/apps/settings/serializers/vault.py b/apps/settings/serializers/vault.py
index b3f8d4e78..b8b94d5ca 100644
--- a/apps/settings/serializers/vault.py
+++ b/apps/settings/serializers/vault.py
@@ -1,4 +1,4 @@
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from rest_framework import serializers
 
 from accounts.const import VaultTypeChoices