Skip to content

Commit

Permalink
isort
Browse files Browse the repository at this point in the history
  • Loading branch information
kaedroho committed Apr 16, 2016
1 parent fdf61eb commit 8184db0
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 14 deletions.
13 changes: 6 additions & 7 deletions wagtail/wagtailadmin/api/endpoints.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
from __future__ import absolute_import, unicode_literals

from collections import OrderedDict

from wagtail.api.v2.utils import BadRequestError, page_models_from_string, filter_page_type
from wagtail.api.v2.endpoints import PagesAPIEndpoint, ImagesAPIEndpoint, DocumentsAPIEndpoint
from wagtail.api.v2.endpoints import DocumentsAPIEndpoint, ImagesAPIEndpoint, PagesAPIEndpoint
from wagtail.api.v2.filters import (
FieldsFilter, OrderingFilter, SearchFilter,
ChildOfFilter, DescendantOfFilter
)

ChildOfFilter, DescendantOfFilter, FieldsFilter, OrderingFilter, SearchFilter)
from wagtail.api.v2.utils import BadRequestError, filter_page_type, page_models_from_string
from wagtail.wagtailcore.models import Page

from .serializers import AdminPageSerializer, AdminImageSerializer
from .filters import HasChildrenFilter
from .serializers import AdminImageSerializer, AdminPageSerializer


class PagesAdminAPIEndpoint(PagesAPIEndpoint):
Expand Down
2 changes: 2 additions & 0 deletions wagtail/wagtailadmin/api/filters.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
from __future__ import absolute_import, unicode_literals

from rest_framework.filters import BaseFilterBackend

from wagtail.api.v2.utils import BadRequestError
Expand Down
4 changes: 3 additions & 1 deletion wagtail/wagtailadmin/api/serializers.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
from __future__ import absolute_import, unicode_literals

from collections import OrderedDict

from rest_framework.fields import Field

from wagtail.api.v2.serializers import ImageSerializer, PageSerializer
from wagtail.api.v2.utils import get_full_url
from wagtail.api.v2.serializers import PageSerializer, ImageSerializer
from wagtail.wagtailcore.models import Page
from wagtail.wagtailimages.models import SourceImageIOError

Expand Down
5 changes: 2 additions & 3 deletions wagtail/wagtailadmin/api/urls.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
from __future__ import absolute_import
from __future__ import absolute_import, unicode_literals

from django.conf.urls import url

from wagtail.api.v2.router import WagtailAPIRouter

from .endpoints import PagesAdminAPIEndpoint, ImagesAdminAPIEndpoint, DocumentsAdminAPIEndpoint

from .endpoints import DocumentsAdminAPIEndpoint, ImagesAdminAPIEndpoint, PagesAdminAPIEndpoint

v1 = WagtailAPIRouter('wagtailadmin_api_v1')
v1.register_endpoint('pages', PagesAdminAPIEndpoint)
Expand Down
2 changes: 2 additions & 0 deletions wagtail/wagtailadmin/tests/api/test_documents.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
from __future__ import absolute_import, unicode_literals

import json

from django.core.urlresolvers import reverse
Expand Down
2 changes: 2 additions & 0 deletions wagtail/wagtailadmin/tests/api/test_images.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
from __future__ import absolute_import, unicode_literals

import json

from django.core.urlresolvers import reverse
Expand Down
7 changes: 4 additions & 3 deletions wagtail/wagtailadmin/tests/api/test_pages.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
import json
from __future__ import absolute_import, unicode_literals

import collections
import datetime
import json

from django.core.urlresolvers import reverse
from django.utils import timezone

from wagtail.api.v2.tests.test_pages import TestPageDetail, TestPageListing
from wagtail.wagtailcore.models import Page

from wagtail.tests.demosite import models
from wagtail.tests.testapp.models import StreamPage
from wagtail.wagtailcore.models import Page

from .utils import AdminAPITestCase

Expand Down
2 changes: 2 additions & 0 deletions wagtail/wagtailadmin/tests/api/utils.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
from __future__ import absolute_import, unicode_literals

from django.test import TestCase

from wagtail.tests.utils import WagtailTestUtils
Expand Down

0 comments on commit 8184db0

Please sign in to comment.