使用Python3和更科学的API写法

This commit is contained in:
virusdefender committed 2016-11-19 12:32:23 +08:00
1 parent d9b1141cb9
commit 172fd4b1f4
21 files changed
+335 -270

No files matched your search

-2
View File
@@ -1,5 +1,3 @@
# coding=utf-8
from __future__ import unicode_literals
from django.db import models
from account.models import User
+2 -5
View File
@@ -1,10 +1,7 @@
# coding=utf-8
from __future__ import unicode_literals
from rest_framework import serializers
from utils.api import serializers
from account.models import User
from utils.serializers import DateTimeTZField
from utils.api._serializers import DateTimeTZField
from .models import Announcement
+2 -4
View File
@@ -1,12 +1,10 @@
# coding=utf-8
from django.core.urlresolvers import reverse
from utils.tests import APITestCase
from utils.api.tests import APITestCase, APIClient
class AnnouncementAdminTest(APITestCase):
def setUp(self):
self.user = self.create_super_admin(login=True)
self.url = reverse("announcement_admin_api")
self.url = self.reverse("announcement_admin_api")
def test_announcement_list(self):
response = self.client.get(self.url)
-1
View File
@@ -1,4 +1,3 @@
# coding=utf-8
from django.conf.urls import url
from ..views import AnnouncementAdminAPIView
+3 -5
View File
@@ -1,10 +1,8 @@
# coding=utf-8
from __future__ import unicode_literals
from django.utils.translation import ugettext as _
from account.decorators import super_admin_required
from utils.shortcuts import paginate_data, APIView
from utils.api import APIView
from .models import Announcement
from .serializers import (CreateAnnouncementSerializer, AnnouncementSerializer,
EditAnnouncementSerializer)
@@ -63,4 +61,4 @@ class AnnouncementAdminAPIView(APIView):
announcement = Announcement.objects.all().order_by("-create_time")
if request.GET.get("visible") == "true":
announcement = announcement.filter(visible=True)
return self.success(paginate_data(request, announcement, AnnouncementSerializer))
return self.success(self.paginate_data(request, announcement, AnnouncementSerializer))