diff options
author | Tim Graham <timograham@gmail.com> | 2015-01-28 07:35:27 -0500 |
---|---|---|
committer | Tim Graham <timograham@gmail.com> | 2015-02-06 08:16:28 -0500 |
commit | 0ed7d155635da9f79d4dd67e4889087d3673c6da (patch) | |
tree | cf5c59b563f01774f32e20b3af8cb24a387fdc4d /tests/admin_changelist | |
parent | 388d986b8a6bb1363dab9f53ea435dff4dfe92cb (diff) | |
download | django-0ed7d155635da9f79d4dd67e4889087d3673c6da.tar.gz |
Sorted imports with isort; refs #23860.
Diffstat (limited to 'tests/admin_changelist')
-rw-r--r-- | tests/admin_changelist/admin.py | 5 | ||||
-rw-r--r-- | tests/admin_changelist/tests.py | 29 | ||||
-rw-r--r-- | tests/admin_changelist/urls.py | 1 |
3 files changed, 18 insertions, 17 deletions
diff --git a/tests/admin_changelist/admin.py b/tests/admin_changelist/admin.py index b2bd578e80..926a45d518 100644 --- a/tests/admin_changelist/admin.py +++ b/tests/admin_changelist/admin.py @@ -1,10 +1,9 @@ from django.contrib import admin -from django.core.paginator import Paginator from django.contrib.auth.admin import UserAdmin from django.contrib.auth.models import User +from django.core.paginator import Paginator -from .models import Event, Child, Parent, Swallow - +from .models import Child, Event, Parent, Swallow site = admin.AdminSite(name="admin") diff --git a/tests/admin_changelist/tests.py b/tests/admin_changelist/tests.py index 16b56aef86..8647ff7e2c 100644 --- a/tests/admin_changelist/tests.py +++ b/tests/admin_changelist/tests.py @@ -5,25 +5,28 @@ import datetime from django.contrib import admin from django.contrib.admin.options import IncorrectLookupParameters from django.contrib.admin.templatetags.admin_list import pagination -from django.contrib.admin.views.main import ChangeList, SEARCH_VAR, ALL_VAR from django.contrib.admin.tests import AdminSeleniumWebDriverTestCase +from django.contrib.admin.views.main import ALL_VAR, SEARCH_VAR, ChangeList from django.contrib.auth.models import User from django.core.urlresolvers import reverse from django.template import Context, Template from django.test import TestCase, override_settings from django.test.client import RequestFactory -from django.utils import formats -from django.utils import six - -from .admin import (ChildAdmin, QuartetAdmin, BandAdmin, ChordsBandAdmin, - GroupAdmin, ParentAdmin, DynamicListDisplayChildAdmin, - DynamicListDisplayLinksChildAdmin, CustomPaginationAdmin, - FilteredChildAdmin, CustomPaginator, site as custom_site, - SwallowAdmin, DynamicListFilterChildAdmin, InvitationAdmin, - DynamicSearchFieldsChildAdmin, NoListDisplayLinksParentAdmin) -from .models import (Event, Child, Parent, Genre, Band, Musician, Group, - Quartet, Membership, ChordsMusician, ChordsBand, Invitation, Swallow, - UnorderedObject, OrderedObject, CustomIdUser) +from django.utils import formats, six + +from .admin import ( + BandAdmin, ChildAdmin, ChordsBandAdmin, CustomPaginationAdmin, + CustomPaginator, DynamicListDisplayChildAdmin, + DynamicListDisplayLinksChildAdmin, DynamicListFilterChildAdmin, + DynamicSearchFieldsChildAdmin, FilteredChildAdmin, GroupAdmin, + InvitationAdmin, NoListDisplayLinksParentAdmin, ParentAdmin, QuartetAdmin, + SwallowAdmin, site as custom_site, +) +from .models import ( + Band, Child, ChordsBand, ChordsMusician, CustomIdUser, Event, Genre, Group, + Invitation, Membership, Musician, OrderedObject, Parent, Quartet, Swallow, + UnorderedObject, +) @override_settings(ROOT_URLCONF="admin_changelist.urls") diff --git a/tests/admin_changelist/urls.py b/tests/admin_changelist/urls.py index b73893b2ae..4da326ccc4 100644 --- a/tests/admin_changelist/urls.py +++ b/tests/admin_changelist/urls.py @@ -2,7 +2,6 @@ from django.conf.urls import include, url from . import admin - urlpatterns = [ url(r'^admin/', include(admin.site.urls)), ] |