From cfc40875268e6c9a5472ae3c800b080a972f4dcb Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Wed, 16 Oct 2013 17:47:38 +0200 Subject: [PATCH] Remove unused serializers from users app. --- greenmine/base/users/api.py | 4 +-- greenmine/base/users/serializers.py | 53 ----------------------------- 2 files changed, 1 insertion(+), 56 deletions(-) diff --git a/greenmine/base/users/api.py b/greenmine/base/users/api.py index d99174e0..fc915633 100644 --- a/greenmine/base/users/api.py +++ b/greenmine/base/users/api.py @@ -18,9 +18,7 @@ from greenmine.base.filters import FilterBackend from greenmine.base.api import ModelCrudViewSet from .models import User, Role -from .serializers import (LoginSerializer, UserLogged, - UserSerializer, RoleSerializer, - RecoverySerializer) +from .serializers import UserSerializer, RoleSerializer, RecoverySerializer class RolesViewSet(viewsets.ViewSet): diff --git a/greenmine/base/users/serializers.py b/greenmine/base/users/serializers.py index 51ddb7c2..ec8c0c7a 100644 --- a/greenmine/base/users/serializers.py +++ b/greenmine/base/users/serializers.py @@ -4,59 +4,6 @@ from rest_framework import serializers from .models import User, Role -class UserLogged(object): - def __init__(self, token, username, first_name, last_name, email, last_login, color, - description, default_language, default_timezone, colorize_tags): - self.token = token - self.username = username - self.first_name = first_name - self.last_name = last_name - self.email = email - self.last_login = last_login - self.color = color - self.description = description - self.default_language = default_language - self.default_timezone = default_timezone - self.colorize_tags = colorize_tags - - -class LoginSerializer(serializers.Serializer): - token = serializers.CharField(max_length=40) - username = serializers.CharField(max_length=30) - first_name = serializers.CharField(max_length=30) - last_name = serializers.CharField(max_length=30) - email = serializers.EmailField() - last_login = serializers.DateTimeField() - color = serializers.CharField(max_length=9) - description = serializers.CharField() - default_language = serializers.CharField(max_length=20) - default_timezone = serializers.CharField(max_length=20) - colorize_tags = serializers.BooleanField() - - def restore_object(self, attrs, instance=None): - """ - Given a dictionary of deserialized field values, either update - an existing model instance, or create a new model instance. - """ - if instance is not None: - instance.token = attrs.get('token', None) - instance.username = attrs.get('username', instance.username) - instance.first_name = attrs.get('first_name', instance.first_name) - instance.last_name = attrs.get('last_name', instance.last_name) - instance.email = attrs.get('email', instance.email) - instance.last_login = attrs.get('last_login', instance.last_login) - instance.color = attrs.get('color', instance.color) - instance.description = attrs.get('description', instance.description) - instance.default_language = attrs.get('default_language', - instance.default_language) - instance.default_timezone = attrs.get('default_timezone', - instance.default_timezone) - instance.colorize_tags = attrs.get('colorize_tags', instance.colorize_tags) - return instance - - return UserLogged(**attrs) - - class UserSerializer(serializers.ModelSerializer): projects = serializers.SerializerMethodField('get_projects') class Meta: