[Python-modules-commits] [djoser] 01/03: Import djoser_0.4.3.orig.tar.gz

[Michael Fladischer]

This is an automated email from the git hooks/post-receive script.

fladi pushed a commit to branch master
in repository djoser.

commit 582ab86ef69ab8e1bd50870bd0c2d0a7814c1189
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Fri Apr 1 21:09:30 2016 +0200

    Import djoser_0.4.3.orig.tar.gz
---
 PKG-INFO                 | 2 +-
 djoser.egg-info/PKG-INFO | 2 +-
 djoser/constants.py      | 1 +
 djoser/serializers.py    | 9 +++++++--
 setup.cfg                | 2 +-
 setup.py                 | 2 +-
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/PKG-INFO b/PKG-INFO
index 751e243..79325c0 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: djoser
-Version: 0.4.2
+Version: 0.4.3
 Summary: REST version of Django authentication system.
 Home-page: https://github.com/sunscrapers/djoser
 Author: SUNSCRAPERS
diff --git a/djoser.egg-info/PKG-INFO b/djoser.egg-info/PKG-INFO
index 751e243..79325c0 100644
--- a/djoser.egg-info/PKG-INFO
+++ b/djoser.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: djoser
-Version: 0.4.2
+Version: 0.4.3
 Summary: REST version of Django authentication system.
 Home-page: https://github.com/sunscrapers/djoser
 Author: SUNSCRAPERS
diff --git a/djoser/constants.py b/djoser/constants.py
index 481c305..df895ae 100644
--- a/djoser/constants.py
+++ b/djoser/constants.py
@@ -3,6 +3,7 @@ from django.utils.translation import ugettext_lazy as _
 INVALID_CREDENTIALS_ERROR = _('Unable to login with provided credentials.')
 INACTIVE_ACCOUNT_ERROR = _('User account is disabled.')
 INVALID_TOKEN_ERROR = _('Invalid token for given user.')
+INVALID_UID_ERROR = _('Invalid user id or user doesn\'t exist.')
 STALE_TOKEN_ERROR = _('Stale token for given user.')
 PASSWORD_MISMATCH_ERROR = _('The two password fields didn\'t match.')
 USERNAME_MISMATCH_ERROR = _('The two {0} fields didn\'t match.')
diff --git a/djoser/serializers.py b/djoser/serializers.py
index 4b6742a..c59dd60 100644
--- a/djoser/serializers.py
+++ b/djoser/serializers.py
@@ -33,7 +33,11 @@ class UserRegistrationSerializer(serializers.ModelSerializer):
         )
 
     def create(self, validated_data):
-        return User.objects.create_user(**validated_data)
+        user = User.objects.create_user(**validated_data)
+        if settings.get('SEND_ACTIVATION_EMAIL'):
+            user.is_active = False
+            user.save(update_fields=['is_active'])
+        return user
 
 
 class LoginSerializer(serializers.Serializer):
@@ -69,6 +73,7 @@ class UidAndTokenSerializer(serializers.Serializer):
 
     default_error_messages = {
         'invalid_token': constants.INVALID_TOKEN_ERROR,
+        'invalid_uid': constants.INVALID_UID_ERROR,
     }
 
     def validate_uid(self, value):
@@ -76,7 +81,7 @@ class UidAndTokenSerializer(serializers.Serializer):
             uid = utils.decode_uid(value)
             self.user = User.objects.get(pk=uid)
         except (User.DoesNotExist, ValueError, TypeError, OverflowError) as error:
-            raise serializers.ValidationError(str(error))
+            raise serializers.ValidationError(self.error_messages['invalid_uid'])
         return value
 
     def validate(self, attrs):
diff --git a/setup.cfg b/setup.cfg
index ebbec92..861a9f5 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [egg_info]
 tag_build = 
-tag_svn_revision = 0
 tag_date = 0
+tag_svn_revision = 0
 
diff --git a/setup.py b/setup.py
index 19fe20a..a6c35d7 100644
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,7 @@ def get_requirements(file_name):
 
 setup(
     name='djoser',
-    version='0.4.2',
+    version='0.4.3',
     packages=get_packages('djoser'),
     license='MIT',
     author='SUNSCRAPERS',

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/djoser.git