From a43ac90b21a1715f9dbc70127cdcda10a4dc2b23 Mon Sep 17 00:00:00 2001 From: ibuler Date: Wed, 24 Aug 2016 00:13:58 +0800 Subject: [PATCH] Modify CRLF to LF --- apps/__init__.py | 14 +++++++------- apps/users/api_urls.py | 32 +++++++++++++++----------------- apps/users/serializers.py | 24 ++++++++++++------------ 3 files changed, 34 insertions(+), 36 deletions(-) diff --git a/apps/__init__.py b/apps/__init__.py index f93d0bec7..597573362 100644 --- a/apps/__init__.py +++ b/apps/__init__.py @@ -1,7 +1,7 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -# - - -if __name__ == '__main__': - pass +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# + + +if __name__ == '__main__': + pass diff --git a/apps/users/api_urls.py b/apps/users/api_urls.py index e31d59ebb..40a1ff414 100644 --- a/apps/users/api_urls.py +++ b/apps/users/api_urls.py @@ -1,17 +1,15 @@ -# -*- coding: utf-8 -*- -# - -from django.conf.urls import url, include -from rest_framework import routers - -from .api import UserViewSet - - -router = routers.DefaultRouter() -router.register(r'users', UserViewSet) - -urlpatterns = [ - url(r'v1/', include(router.urls)), - url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')) -] - +# -*- coding: utf-8 -*- +# + +from django.conf.urls import url, include +from rest_framework import routers + +from .api import UserViewSet + + +router = routers.DefaultRouter() +router.register(r'users', UserViewSet) + +urlpatterns = [ + url(r'v1/', include(router.urls)), + url(r'^api-auth/', include('rest_framework.urls', namespace='rest_fr \ No newline at end of file diff --git a/apps/users/serializers.py b/apps/users/serializers.py index aefe0569b..e08b52b47 100644 --- a/apps/users/serializers.py +++ b/apps/users/serializers.py @@ -1,12 +1,12 @@ -# -*- coding: utf-8 -*- -# - -from rest_framework import serializers - -from .models import Role, User, UserGroup - - -class UserSerializer(serializers.HyperlinkedModelSerializer): - class Meta: - model = User - fields = '__all__' +# -*- coding: utf-8 -*- +# + +from rest_framework import serializers + +from .models import Role, User, UserGroup + + +class UserSerializer(serializers.HyperlinkedModelSerializer): + class Meta: + model = User + fields = \ No newline at end of file