From a8b70d251d238b4e6cfc7bb4296da15494f8dff3 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Mon, 9 Feb 2015 13:19:34 -0500 Subject: [1.8.x] Sorted imports with isort; refs #23860. Backport of 0ed7d155635da9f79d4dd67e4889087d3673c6da from master --- tests/admin_checks/models.py | 4 ++-- tests/admin_checks/tests.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/admin_checks') diff --git a/tests/admin_checks/models.py b/tests/admin_checks/models.py index 6c34d95ab8..dbb5931c8c 100644 --- a/tests/admin_checks/models.py +++ b/tests/admin_checks/models.py @@ -2,10 +2,10 @@ Tests of ModelAdmin system checks logic. """ +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 -from django.contrib.contenttypes.models import ContentType -from django.contrib.contenttypes.fields import GenericForeignKey class Album(models.Model): diff --git a/tests/admin_checks/tests.py b/tests/admin_checks/tests.py index ea0151cced..3b12a35eb3 100644 --- a/tests/admin_checks/tests.py +++ b/tests/admin_checks/tests.py @@ -7,7 +7,7 @@ from django.core import checks from django.core.exceptions import ImproperlyConfigured from django.test import TestCase, ignore_warnings, override_settings -from .models import Song, Book, Album, TwoAlbumFKAndAnE, City, State, Influence +from .models import Album, Book, City, Influence, Song, State, TwoAlbumFKAndAnE class SongForm(forms.ModelForm): -- cgit v1.3