mirror of
https://github.com/Tivix/django-rest-auth.git
synced 2025-07-12 17:02:19 +03:00
Merge branch 'master' into flake8
This commit is contained in:
commit
ece4c01ada
|
@ -110,7 +110,7 @@ class PasswordResetConfirmSerializer(serializers.Serializer):
|
||||||
self.set_password_form = self.set_password_form_class(user=self.user,
|
self.set_password_form = self.set_password_form_class(user=self.user,
|
||||||
data=attrs)
|
data=attrs)
|
||||||
if not self.set_password_form.is_valid():
|
if not self.set_password_form.is_valid():
|
||||||
raise serializers.ValidationError(self.set_password_form.errors)
|
raise serializers.ValidationError(self.set_password_form.errors)
|
||||||
if not default_token_generator.check_token(self.user, attrs['token']):
|
if not default_token_generator.check_token(self.user, attrs['token']):
|
||||||
raise ValidationError({'token': ['Invalid value']})
|
raise ValidationError({'token': ['Invalid value']})
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,9 @@
|
||||||
from six import string_types
|
from six import string_types
|
||||||
from django.utils.importlib import import_module
|
import sys
|
||||||
|
if sys.version_info < (2, 7):
|
||||||
|
from django.utils.importlib import import_module
|
||||||
|
else:
|
||||||
|
from importlib import import_module
|
||||||
|
|
||||||
|
|
||||||
def import_callable(path_or_callable):
|
def import_callable(path_or_callable):
|
||||||
|
|
Loading…
Reference in New Issue
Block a user