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_inlines | |
| parent | 388d986b8a6bb1363dab9f53ea435dff4dfe92cb (diff) | |
Sorted imports with isort; refs #23860.
Diffstat (limited to 'tests/admin_inlines')
| -rw-r--r-- | tests/admin_inlines/admin.py | 2 | ||||
| -rw-r--r-- | tests/admin_inlines/models.py | 3 | ||||
| -rw-r--r-- | tests/admin_inlines/tests.py | 21 | ||||
| -rw-r--r-- | tests/admin_inlines/urls.py | 1 |
4 files changed, 14 insertions, 13 deletions
diff --git a/tests/admin_inlines/admin.py b/tests/admin_inlines/admin.py index 4fc7478132..136cf3a96c 100644 --- a/tests/admin_inlines/admin.py +++ b/tests/admin_inlines/admin.py @@ -1,5 +1,5 @@ -from django.contrib import admin from django import forms +from django.contrib import admin from .models import ( Author, BinaryTree, CapoFamiglia, Chapter, ChildModel1, ChildModel2, diff --git a/tests/admin_inlines/models.py b/tests/admin_inlines/models.py index 0ad59a07bf..d1003f607a 100644 --- a/tests/admin_inlines/models.py +++ b/tests/admin_inlines/models.py @@ -3,11 +3,12 @@ Testing of admin inline formsets. """ from __future__ import unicode_literals + import random -from django.db import models from django.contrib.contenttypes.fields import GenericForeignKey from django.contrib.contenttypes.models import ContentType +from django.db import models from django.utils.encoding import python_2_unicode_compatible diff --git a/tests/admin_inlines/tests.py b/tests/admin_inlines/tests.py index fe481994d0..78889be30e 100644 --- a/tests/admin_inlines/tests.py +++ b/tests/admin_inlines/tests.py @@ -2,21 +2,22 @@ from __future__ import unicode_literals import warnings -from django.contrib.admin import TabularInline, ModelAdmin -from django.contrib.admin.tests import AdminSeleniumWebDriverTestCase +from django.contrib.admin import ModelAdmin, TabularInline from django.contrib.admin.helpers import InlineAdminForm -from django.contrib.auth.models import User, Permission +from django.contrib.admin.tests import AdminSeleniumWebDriverTestCase +from django.contrib.auth.models import Permission, User from django.contrib.contenttypes.models import ContentType -from django.test import TestCase, override_settings, RequestFactory +from django.test import RequestFactory, TestCase, override_settings from django.utils.encoding import force_text -# local test models from .admin import InnerInline, site as admin_site -from .models import (Holder, Inner, Holder2, Inner2, Holder3, Inner3, Person, - OutfitItem, Fashionista, Teacher, Parent, Child, Author, Book, Profile, - ProfileCollection, ParentModelWithCustomPk, ChildModel1, ChildModel2, - Sighting, Novel, Chapter, FootNote, BinaryTree, SomeParentModel, - SomeChildModel, Poll, Question, Inner4Stacked, Inner4Tabular, Holder4) +from .models import ( + Author, BinaryTree, Book, Chapter, Child, ChildModel1, ChildModel2, + Fashionista, FootNote, Holder, Holder2, Holder3, Holder4, Inner, Inner2, + Inner3, Inner4Stacked, Inner4Tabular, Novel, OutfitItem, Parent, + ParentModelWithCustomPk, Person, Poll, Profile, ProfileCollection, + Question, Sighting, SomeChildModel, SomeParentModel, Teacher, +) INLINE_CHANGELINK_HTML = 'class="inlinechangelink">Change</a>' diff --git a/tests/admin_inlines/urls.py b/tests/admin_inlines/urls.py index b73893b2ae..4da326ccc4 100644 --- a/tests/admin_inlines/urls.py +++ b/tests/admin_inlines/urls.py @@ -2,7 +2,6 @@ from django.conf.urls import include, url from . import admin - urlpatterns = [ url(r'^admin/', include(admin.site.urls)), ] |
