summaryrefslogtreecommitdiff
path: root/tests/admin_inlines
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-02-09 13:19:34 -0500
committerTim Graham <timograham@gmail.com>2015-02-09 14:24:06 -0500
commita8b70d251d238b4e6cfc7bb4296da15494f8dff3 (patch)
tree94ef5bc53e59131906aecfcf792eeac86242aa62 /tests/admin_inlines
parenteb406aa686ff1809903366ef6896037af2f1f69b (diff)
[1.8.x] Sorted imports with isort; refs #23860.
Backport of 0ed7d155635da9f79d4dd67e4889087d3673c6da from master
Diffstat (limited to 'tests/admin_inlines')
-rw-r--r--tests/admin_inlines/admin.py2
-rw-r--r--tests/admin_inlines/models.py3
-rw-r--r--tests/admin_inlines/tests.py8
-rw-r--r--tests/admin_inlines/urls.py1
4 files changed, 6 insertions, 8 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 d5c1728bbb..74cb0860d2 100644
--- a/tests/admin_inlines/tests.py
+++ b/tests/admin_inlines/tests.py
@@ -11,15 +11,13 @@ from django.core.urlresolvers import reverse
from django.test import RequestFactory, TestCase, override_settings
from django.utils.encoding import force_text
-from .admin import site as admin_site
-from .admin import InnerInline
+from .admin import InnerInline, site as admin_site
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,
+ 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)),
]