aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/authtoken
diff options
context:
space:
mode:
authorTom Christie2014-10-10 14:16:09 +0100
committerTom Christie2014-10-10 14:16:09 +0100
commitd9a199ca0ddf92f999aa37b396596d0e3e0a26d9 (patch)
treec7521c3c046e5f97e52bab51aef8a5367ad52f6e /rest_framework/authtoken
parenta0e852a4d52558db93209b4616f030b4ae2dcedb (diff)
downloaddjango-rest-framework-d9a199ca0ddf92f999aa37b396596d0e3e0a26d9.tar.bz2
exceptions.ValidationFailed, not Django's ValidationError
Diffstat (limited to 'rest_framework/authtoken')
-rw-r--r--rest_framework/authtoken/serializers.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/rest_framework/authtoken/serializers.py b/rest_framework/authtoken/serializers.py
index c2c456de..a808d0a3 100644
--- a/rest_framework/authtoken/serializers.py
+++ b/rest_framework/authtoken/serializers.py
@@ -1,7 +1,7 @@
from django.contrib.auth import authenticate
from django.utils.translation import ugettext_lazy as _
-from rest_framework import serializers
+from rest_framework import exceptions, serializers
class AuthTokenSerializer(serializers.Serializer):
@@ -18,13 +18,13 @@ class AuthTokenSerializer(serializers.Serializer):
if user:
if not user.is_active:
msg = _('User account is disabled.')
- raise serializers.ValidationError(msg)
+ raise exceptions.ValidationFailed(msg)
else:
msg = _('Unable to log in with provided credentials.')
- raise serializers.ValidationError(msg)
+ raise exceptions.ValidationFailed(msg)
else:
msg = _('Must include "username" and "password"')
- raise serializers.ValidationError(msg)
+ raise exceptions.ValidationFailed(msg)
attrs['user'] = user
return attrs