mirror of
https://github.com/Tivix/django-rest-auth.git
synced 2024-11-26 02:53:46 +03:00
Update serializers.py
in django 4.0 we dont have force_text and ugettext_lazy has been removed in Django 4.0
This commit is contained in:
parent
d5fceddbe1
commit
c447f0ddf6
|
@ -3,8 +3,8 @@ from django.conf import settings
|
||||||
from django.contrib.auth.forms import PasswordResetForm, SetPasswordForm
|
from django.contrib.auth.forms import PasswordResetForm, SetPasswordForm
|
||||||
from django.contrib.auth.tokens import default_token_generator
|
from django.contrib.auth.tokens import default_token_generator
|
||||||
from django.utils.http import urlsafe_base64_decode as uid_decoder
|
from django.utils.http import urlsafe_base64_decode as uid_decoder
|
||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import gettext_lazy as _
|
||||||
from django.utils.encoding import force_text
|
from django.utils.encoding import force_str
|
||||||
|
|
||||||
from rest_framework import serializers, exceptions
|
from rest_framework import serializers, exceptions
|
||||||
from rest_framework.exceptions import ValidationError
|
from rest_framework.exceptions import ValidationError
|
||||||
|
@ -205,7 +205,7 @@ class PasswordResetConfirmSerializer(serializers.Serializer):
|
||||||
|
|
||||||
# Decode the uidb64 to uid to get User object
|
# Decode the uidb64 to uid to get User object
|
||||||
try:
|
try:
|
||||||
uid = force_text(uid_decoder(attrs['uid']))
|
uid = force_str(uid_decoder(attrs['uid']))
|
||||||
self.user = UserModel._default_manager.get(pk=uid)
|
self.user = UserModel._default_manager.get(pk=uid)
|
||||||
except (TypeError, ValueError, OverflowError, UserModel.DoesNotExist):
|
except (TypeError, ValueError, OverflowError, UserModel.DoesNotExist):
|
||||||
raise ValidationError({'uid': ['Invalid value']})
|
raise ValidationError({'uid': ['Invalid value']})
|
||||||
|
@ -256,8 +256,7 @@ class PasswordChangeSerializer(serializers.Serializer):
|
||||||
)
|
)
|
||||||
|
|
||||||
if all(invalid_password_conditions):
|
if all(invalid_password_conditions):
|
||||||
err_msg = _("Your old password was entered incorrectly. Please enter it again.")
|
raise serializers.ValidationError('Invalid password')
|
||||||
raise serializers.ValidationError(err_msg)
|
|
||||||
return value
|
return value
|
||||||
|
|
||||||
def validate(self, attrs):
|
def validate(self, attrs):
|
||||||
|
|
Loading…
Reference in New Issue
Block a user