set line_length=200 for isort
Brightcells
39 changed files with 53 additions and 39 deletions
+ 5
- 1
.isort.cfg
@@ -1,4 +1,8 @@ |
||
| 1 |
+# See the menu of settings available here: |
|
| 2 |
+# https://github.com/timothycrosley/isort/wiki/isort-Settings |
|
| 3 |
+ |
|
| 1 | 4 |
[settings] |
| 2 | 5 |
indent=' ' |
| 3 |
-line_length=120 |
|
| 6 |
+line_length=200 |
|
| 7 |
+lines_after_imports=2 |
|
| 4 | 8 |
skip=migrations |
+ 1
- 2
account/admin.py
@@ -4,8 +4,7 @@ from curtail_uuid import CurtailUUID |
||
| 4 | 4 |
from django.contrib import admin |
| 5 | 5 |
from django.contrib.auth.hashers import make_password |
| 6 | 6 |
|
| 7 |
-from account.models import (LensmanInfo, LensmanLoginLogInfo, UserInfo, |
|
| 8 |
- UserLoginLogInfo) |
|
| 7 |
+from account.models import LensmanInfo, LensmanLoginLogInfo, UserInfo, UserLoginLogInfo |
|
| 9 | 8 |
|
| 10 | 9 |
|
| 11 | 10 |
class LensmanInfoAdmin(admin.ModelAdmin): |
+ 1
- 0
account/tests.py
@@ -1,3 +1,4 @@ |
||
| 1 | 1 |
from django.test import TestCase |
| 2 | 2 |
|
| 3 |
+ |
|
| 3 | 4 |
# Create your tests here. |
+ 1
- 2
account/views.py
@@ -8,8 +8,7 @@ from rest_framework import viewsets |
||
| 8 | 8 |
from TimeConvert import TimeConvert as tc |
| 9 | 9 |
|
| 10 | 10 |
from account.models import LensmanInfo, UserInfo, UserLoginLogInfo |
| 11 |
-from account.serializers import (GroupSerializer, LensmanInfoSerializer, |
|
| 12 |
- UserInfoSerializer, UserSerializer) |
|
| 11 |
+from account.serializers import GroupSerializer, LensmanInfoSerializer, UserInfoSerializer, UserSerializer |
|
| 13 | 12 |
from utils.error.errno_utils import LensmanStatusCode, UserStatusCode |
| 14 | 13 |
from utils.error.response_utils import response |
| 15 | 14 |
from utils.ip_utils import ip_addr |
+ 1
- 0
api/admin.py
@@ -1,3 +1,4 @@ |
||
| 1 | 1 |
from django.contrib import admin |
| 2 | 2 |
|
| 3 |
+ |
|
| 3 | 4 |
# Register your models here. |
+ 1
- 0
api/models.py
@@ -1,3 +1,4 @@ |
||
| 1 | 1 |
from django.db import models |
| 2 | 2 |
|
| 3 |
+ |
|
| 3 | 4 |
# Create your models here. |
+ 1
- 0
api/tests.py
@@ -1,3 +1,4 @@ |
||
| 1 | 1 |
from django.test import TestCase |
| 2 | 2 |
|
| 3 |
+ |
|
| 3 | 4 |
# Create your tests here. |
+ 1
- 0
api/urls.py
@@ -9,6 +9,7 @@ from operation import views as op_views |
||
| 9 | 9 |
from pay import views as pay_views |
| 10 | 10 |
from photo import views as photo_views |
| 11 | 11 |
|
| 12 |
+ |
|
| 12 | 13 |
# 帐户相关 |
| 13 | 14 |
urlpatterns = [ |
| 14 | 15 |
url(r'^login$', account_views.lensman_login_api, name='lensman_login_api'), # 摄影师登录 |
+ 1
- 0
api/views.py
@@ -1,3 +1,4 @@ |
||
| 1 | 1 |
from django.shortcuts import render |
| 2 | 2 |
|
| 3 |
+ |
|
| 3 | 4 |
# Create your views here. |
+ 1
- 2
group/admin.py
@@ -2,8 +2,7 @@ |
||
| 2 | 2 |
|
| 3 | 3 |
from django.contrib import admin |
| 4 | 4 |
|
| 5 |
-from group.models import (GroupInfo, GroupPhotoInfo, GroupPhotoOrderInfo, |
|
| 6 |
- GroupUserInfo, PhotoCommentInfo, PhotoThumbUpInfo) |
|
| 5 |
+from group.models import GroupInfo, GroupPhotoInfo, GroupPhotoOrderInfo, GroupUserInfo, PhotoCommentInfo, PhotoThumbUpInfo |
|
| 7 | 6 |
|
| 8 | 7 |
|
| 9 | 8 |
class GroupInfoAdmin(admin.ModelAdmin): |
+ 1
- 0
group/models.py
@@ -9,6 +9,7 @@ from utils.redis.rgroup import get_group_photo_thumbup_flag |
||
| 9 | 9 |
from utils.redis.rorder import get_lensman_order_record |
| 10 | 10 |
from utils.url_utils import img_url |
| 11 | 11 |
|
| 12 |
+ |
|
| 12 | 13 |
r = settings.REDIS_CACHE |
| 13 | 14 |
|
| 14 | 15 |
|
+ 1
- 0
group/tests.py
@@ -1,3 +1,4 @@ |
||
| 1 | 1 |
from django.test import TestCase |
| 2 | 2 |
|
| 3 |
+ |
|
| 3 | 4 |
# Create your tests here. |
+ 6
- 14
group/views.py
@@ -14,29 +14,21 @@ from rest_framework import viewsets |
||
| 14 | 14 |
from TimeConvert import TimeConvert as tc |
| 15 | 15 |
|
| 16 | 16 |
from account.models import UserInfo |
| 17 |
-from group.models import (GroupInfo, GroupPhotoInfo, GroupUserInfo, |
|
| 18 |
- PhotoCommentInfo, PhotoThumbUpInfo) |
|
| 19 |
-from group.serializers import (GroupInfoSerializer, GroupPhotoInfoSerializer, |
|
| 20 |
- GroupUserInfoSerializer) |
|
| 17 |
+from group.models import GroupInfo, GroupPhotoInfo, GroupUserInfo, PhotoCommentInfo, PhotoThumbUpInfo |
|
| 18 |
+from group.serializers import GroupInfoSerializer, GroupPhotoInfoSerializer, GroupUserInfoSerializer |
|
| 21 | 19 |
from message.models import UserMessageInfo |
| 22 |
-from utils.error.errno_utils import (GroupPhotoStatusCode, GroupStatusCode, |
|
| 23 |
- GroupUserStatusCode, UserStatusCode) |
|
| 20 |
+from utils.error.errno_utils import GroupPhotoStatusCode, GroupStatusCode, GroupUserStatusCode, UserStatusCode |
|
| 24 | 21 |
from utils.error.response_utils import response |
| 25 | 22 |
from utils.page_utils import pagination |
| 26 |
-from utils.redis.rgroup import (del_group_photo_thumbup_flag, get_group_info, |
|
| 27 |
- get_group_photo_thumbup_flag, |
|
| 28 |
- get_group_users_info, set_group_info, |
|
| 29 |
- set_group_photo_thumbup_flag, |
|
| 30 |
- set_group_users_info) |
|
| 31 |
-from utils.redis.rkeys import (GROUP_LAST_PHOTO_PK, GROUP_USERS_APPLYING_SET, |
|
| 32 |
- GROUP_USERS_DELETED_SET, GROUP_USERS_PASSED_SET, |
|
| 33 |
- GROUP_USERS_QUIT_SET, GROUP_USERS_REFUSED_SET, |
|
| 23 |
+from utils.redis.rgroup import del_group_photo_thumbup_flag, get_group_info, get_group_photo_thumbup_flag, get_group_users_info, set_group_info, set_group_photo_thumbup_flag, set_group_users_info |
|
| 24 |
+from utils.redis.rkeys import (GROUP_LAST_PHOTO_PK, GROUP_USERS_APPLYING_SET, GROUP_USERS_DELETED_SET, GROUP_USERS_PASSED_SET, GROUP_USERS_QUIT_SET, GROUP_USERS_REFUSED_SET, |
|
| 34 | 25 |
LENSMAN_PHOTO_HAGGLE_TIMES, LENSMAN_PHOTO_PRICE) |
| 35 | 26 |
from utils.redis.rorder import get_lensman_order_record |
| 36 | 27 |
from utils.sql.raw import PAI2_HOME_API |
| 37 | 28 |
from utils.thumbnail_utils import make_thumbnail |
| 38 | 29 |
from utils.url_utils import img_url |
| 39 | 30 |
|
| 31 |
+ |
|
| 40 | 32 |
r = settings.REDIS_CACHE |
| 41 | 33 |
|
| 42 | 34 |
|
+ 1
- 1
isort.sh
@@ -1,3 +1,3 @@ |
||
| 1 | 1 |
#!/bin/bash |
| 2 | 2 |
|
| 3 |
-isort -rc --settings-path .isort.cfg . |
|
| 3 |
+isort -rc -sp .isort.cfg . |
+ 1
- 0
manage.py
@@ -2,6 +2,7 @@ |
||
| 2 | 2 |
import os |
| 3 | 3 |
import sys |
| 4 | 4 |
|
| 5 |
+ |
|
| 5 | 6 |
if __name__ == "__main__": |
| 6 | 7 |
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "pai2.settings")
|
| 7 | 8 |
|
+ 1
- 2
message/admin.py
@@ -2,8 +2,7 @@ |
||
| 2 | 2 |
|
| 3 | 3 |
from django.contrib import admin |
| 4 | 4 |
|
| 5 |
-from message.models import (SystemMessageDeleteInfo, SystemMessageInfo, |
|
| 6 |
- SystemMessageReadInfo, UserMessageInfo) |
|
| 5 |
+from message.models import SystemMessageDeleteInfo, SystemMessageInfo, SystemMessageReadInfo, UserMessageInfo |
|
| 7 | 6 |
|
| 8 | 7 |
|
| 9 | 8 |
class UserMessageInfoAdmin(admin.ModelAdmin): |
+ 1
- 0
message/tests.py
@@ -1,3 +1,4 @@ |
||
| 1 | 1 |
from django.test import TestCase |
| 2 | 2 |
|
| 3 |
+ |
|
| 3 | 4 |
# Create your tests here. |
+ 2
- 6
message/views.py
@@ -4,15 +4,11 @@ from django.conf import settings |
||
| 4 | 4 |
from django.http import JsonResponse |
| 5 | 5 |
|
| 6 | 6 |
from account.models import UserInfo |
| 7 |
-from message.models import (SystemMessageDeleteInfo, SystemMessageInfo, |
|
| 8 |
- SystemMessageReadInfo, UserMessageInfo) |
|
| 7 |
+from message.models import SystemMessageDeleteInfo, SystemMessageInfo, SystemMessageReadInfo, UserMessageInfo |
|
| 9 | 8 |
from utils.error.errno_utils import MessageStatusCode, UserStatusCode |
| 10 | 9 |
from utils.error.response_utils import response |
| 11 | 10 |
from utils.page_utils import pagination |
| 12 |
-from utils.redis.rmessage import (get_system_message_delete_info, |
|
| 13 |
- get_system_message_read_info, |
|
| 14 |
- set_system_message_delete_info, |
|
| 15 |
- set_system_message_read_info) |
|
| 11 |
+from utils.redis.rmessage import get_system_message_delete_info, get_system_message_read_info, set_system_message_delete_info, set_system_message_read_info |
|
| 16 | 12 |
|
| 17 | 13 |
|
| 18 | 14 |
def message_list_api(request): |
+ 1
- 0
operation/tests.py
@@ -1,3 +1,4 @@ |
||
| 1 | 1 |
from django.test import TestCase |
| 2 | 2 |
|
| 3 |
+ |
|
| 3 | 4 |
# Create your tests here. |
+ 1
- 0
page/admin.py
@@ -1,3 +1,4 @@ |
||
| 1 | 1 |
from django.contrib import admin |
| 2 | 2 |
|
| 3 |
+ |
|
| 3 | 4 |
# Register your models here. |
+ 1
- 0
page/models.py
@@ -1,3 +1,4 @@ |
||
| 1 | 1 |
from django.db import models |
| 2 | 2 |
|
| 3 |
+ |
|
| 3 | 4 |
# Create your models here. |
+ 1
- 0
page/tests.py
@@ -1,3 +1,4 @@ |
||
| 1 | 1 |
from django.test import TestCase |
| 2 | 2 |
|
| 3 |
+ |
|
| 3 | 4 |
# Create your tests here. |
+ 1
- 0
pai2/settings.py
@@ -15,6 +15,7 @@ https://docs.djangoproject.com/en/1.8/ref/settings/ |
||
| 15 | 15 |
# Build paths inside the project like this: os.path.join(BASE_DIR, ...) |
| 16 | 16 |
import os |
| 17 | 17 |
|
| 18 |
+ |
|
| 18 | 19 |
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) |
| 19 | 20 |
PROJ_DIR = os.path.abspath(os.path.dirname(os.path.abspath(__file__))) |
| 20 | 21 |
|
+ 1
- 0
pai2/urls.py
@@ -27,6 +27,7 @@ from page import views as page_views |
||
| 27 | 27 |
from photo import views as photo_views |
| 28 | 28 |
from website import views as website_views |
| 29 | 29 |
|
| 30 |
+ |
|
| 30 | 31 |
router = routers.DefaultRouter() |
| 31 | 32 |
# router.register(r'users', account_views.UserViewSet) |
| 32 | 33 |
# router.register(r'groups', account_views.GroupViewSet) |
+ 1
- 0
pai2/urls_api.py
@@ -3,6 +3,7 @@ |
||
| 3 | 3 |
from django.conf import settings |
| 4 | 4 |
from django.conf.urls import include, url |
| 5 | 5 |
|
| 6 |
+ |
|
| 6 | 7 |
urlpatterns = [ |
| 7 | 8 |
url(r'^', include('api.urls', namespace='api')),
|
| 8 | 9 |
] |
+ 1
- 0
pai2/views.py
@@ -1,3 +1,4 @@ |
||
| 1 | 1 |
from django.shortcuts import render |
| 2 | 2 |
|
| 3 |
+ |
|
| 3 | 4 |
# Create your views here. |
+ 1
- 0
pai2/wsgi.py
@@ -11,6 +11,7 @@ import os |
||
| 11 | 11 |
|
| 12 | 12 |
from django.core.wsgi import get_wsgi_application |
| 13 | 13 |
|
| 14 |
+ |
|
| 14 | 15 |
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "pai2.settings")
|
| 15 | 16 |
|
| 16 | 17 |
application = get_wsgi_application() |
+ 1
- 0
pay/tests.py
@@ -1,3 +1,4 @@ |
||
| 1 | 1 |
from django.test import TestCase |
| 2 | 2 |
|
| 3 |
+ |
|
| 3 | 4 |
# Create your tests here. |
+ 1
- 0
pay/views.py
@@ -18,6 +18,7 @@ from utils.page_utils import pagination |
||
| 18 | 18 |
from utils.redis.rkeys import LENSMAN_PHOTO_PRICE |
| 19 | 19 |
from utils.redis.rorder import set_lensman_order_record |
| 20 | 20 |
|
| 21 |
+ |
|
| 21 | 22 |
r = settings.REDIS_CACHE |
| 22 | 23 |
WECHAT = settings.WECHAT |
| 23 | 24 |
|
+ 1
- 0
photo/tests.py
@@ -1,3 +1,4 @@ |
||
| 1 | 1 |
from django.test import TestCase |
| 2 | 2 |
|
| 3 |
+ |
|
| 3 | 4 |
# Create your tests here. |
+ 2
- 2
photo/views.py
@@ -19,12 +19,12 @@ from photo.serializers import PhotosInfoSerializer |
||
| 19 | 19 |
from utils.error.errno_utils import PhotoStatusCode |
| 20 | 20 |
from utils.error.response_utils import response |
| 21 | 21 |
from utils.ip_utils import ip_addr |
| 22 |
-from utils.redis.rgroup import (get_group_info, get_group_users_info, |
|
| 23 |
- set_group_info, set_group_users_info) |
|
| 22 |
+from utils.redis.rgroup import get_group_info, get_group_users_info, set_group_info, set_group_users_info |
|
| 24 | 23 |
from utils.redis.rkeys import GROUP_LAST_PHOTO_PK |
| 25 | 24 |
from utils.thumbnail_utils import make_thumbnail |
| 26 | 25 |
from utils.watermark_utils import watermark_wrap |
| 27 | 26 |
|
| 27 |
+ |
|
| 28 | 28 |
r = settings.REDIS_CACHE |
| 29 | 29 |
|
| 30 | 30 |
|
+ 2
- 3
utils/redis/retrieve.py
@@ -3,9 +3,8 @@ |
||
| 3 | 3 |
from django.conf import settings |
| 4 | 4 |
|
| 5 | 5 |
from group.models import GroupInfo, GroupPhotoInfo, GroupUserInfo |
| 6 |
-from utils.redis.rkeys import (GROUP_LAST_PHOTO_PK, GROUP_USERS_APPLYING_SET, |
|
| 7 |
- GROUP_USERS_DELETED_SET, GROUP_USERS_PASSED_SET, |
|
| 8 |
- GROUP_USERS_REFUSED_SET) |
|
| 6 |
+from utils.redis.rkeys import GROUP_LAST_PHOTO_PK, GROUP_USERS_APPLYING_SET, GROUP_USERS_DELETED_SET, GROUP_USERS_PASSED_SET, GROUP_USERS_REFUSED_SET |
|
| 7 |
+ |
|
| 9 | 8 |
|
| 10 | 9 |
r = settings.REDIS_CACHE |
| 11 | 10 |
|
+ 2
- 2
utils/redis/rgroup.py
@@ -5,8 +5,8 @@ import json |
||
| 5 | 5 |
from django.conf import settings |
| 6 | 6 |
from django.core.serializers.json import DjangoJSONEncoder |
| 7 | 7 |
|
| 8 |
-from utils.redis.rkeys import (GROUP_INFO, GROUP_PHOTO_THUMB_UP, |
|
| 9 |
- GROUP_USERS_INFO) |
|
| 8 |
+from utils.redis.rkeys import GROUP_INFO, GROUP_PHOTO_THUMB_UP, GROUP_USERS_INFO |
|
| 9 |
+ |
|
| 10 | 10 |
|
| 11 | 11 |
r = settings.REDIS_CACHE |
| 12 | 12 |
|
+ 2
- 2
utils/redis/rmessage.py
@@ -5,8 +5,8 @@ import json |
||
| 5 | 5 |
from django.conf import settings |
| 6 | 6 |
|
| 7 | 7 |
from message.models import SystemMessageDeleteInfo, SystemMessageReadInfo |
| 8 |
-from utils.redis.rkeys import (SYSTEM_MESSAGE_DELETED_INFO, |
|
| 9 |
- SYSTEM_MESSAGE_READ_INFO) |
|
| 8 |
+from utils.redis.rkeys import SYSTEM_MESSAGE_DELETED_INFO, SYSTEM_MESSAGE_READ_INFO |
|
| 9 |
+ |
|
| 10 | 10 |
|
| 11 | 11 |
r = settings.REDIS_CACHE |
| 12 | 12 |
|
+ 1
- 0
utils/redis/rorder.py
@@ -7,6 +7,7 @@ from django.core.serializers.json import DjangoJSONEncoder |
||
| 7 | 7 |
|
| 8 | 8 |
from utils.redis.rkeys import LENSMAN_PHOTO_ORDER_RECORD |
| 9 | 9 |
|
| 10 |
+ |
|
| 10 | 11 |
r = settings.REDIS_CACHE |
| 11 | 12 |
|
| 12 | 13 |
|
+ 1
- 0
utils/thumbnail_utils.py
@@ -2,6 +2,7 @@ |
||
| 2 | 2 |
|
| 3 | 3 |
from __future__ import division |
| 4 | 4 |
|
| 5 |
+ |
|
| 5 | 6 |
try: |
| 6 | 7 |
from PIL import Image |
| 7 | 8 |
except ImportError: |
+ 1
- 0
website/admin.py
@@ -1,3 +1,4 @@ |
||
| 1 | 1 |
from django.contrib import admin |
| 2 | 2 |
|
| 3 |
+ |
|
| 3 | 4 |
# Register your models here. |
+ 1
- 0
website/models.py
@@ -1,3 +1,4 @@ |
||
| 1 | 1 |
from django.db import models |
| 2 | 2 |
|
| 3 |
+ |
|
| 3 | 4 |
# Create your models here. |
+ 1
- 0
website/tests.py
@@ -1,3 +1,4 @@ |
||
| 1 | 1 |
from django.test import TestCase |
| 2 | 2 |
|
| 3 |
+ |
|
| 3 | 4 |
# Create your tests here. |