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/generic_relations_regress | |
parent | 388d986b8a6bb1363dab9f53ea435dff4dfe92cb (diff) | |
download | django-0ed7d155635da9f79d4dd67e4889087d3673c6da.tar.gz |
Sorted imports with isort; refs #23860.
Diffstat (limited to 'tests/generic_relations_regress')
-rw-r--r-- | tests/generic_relations_regress/models.py | 5 | ||||
-rw-r--r-- | tests/generic_relations_regress/tests.py | 11 |
2 files changed, 7 insertions, 9 deletions
diff --git a/tests/generic_relations_regress/models.py b/tests/generic_relations_regress/models.py index b57b887e4a..ffedbc86f8 100644 --- a/tests/generic_relations_regress/models.py +++ b/tests/generic_relations_regress/models.py @@ -1,11 +1,10 @@ from django.contrib.contenttypes.fields import ( - GenericForeignKey, GenericRelation + GenericForeignKey, GenericRelation, ) from django.contrib.contenttypes.models import ContentType from django.db import models -from django.utils.encoding import python_2_unicode_compatible from django.db.models.deletion import ProtectedError - +from django.utils.encoding import python_2_unicode_compatible __all__ = ('Link', 'Place', 'Restaurant', 'Person', 'Address', 'CharLink', 'TextLink', 'OddRelation1', 'OddRelation2', diff --git a/tests/generic_relations_regress/tests.py b/tests/generic_relations_regress/tests.py index 88243bade0..0d78223725 100644 --- a/tests/generic_relations_regress/tests.py +++ b/tests/generic_relations_regress/tests.py @@ -1,14 +1,13 @@ from django.db.models import Q, Sum +from django.db.models.deletion import ProtectedError from django.db.utils import IntegrityError -from django.test import TestCase, skipIfDBFeature from django.forms.models import modelform_factory -from django.db.models.deletion import ProtectedError +from django.test import TestCase, skipIfDBFeature from .models import ( - Address, Place, Restaurant, Link, CharLink, TextLink, - Person, Contact, Note, Organization, OddRelation1, OddRelation2, Company, - Developer, Team, Guild, Tag, Board, HasLinkThing, A, B, C, D, - Related, Content, Node, + A, B, C, D, Address, Board, CharLink, Company, Contact, Content, Developer, + Guild, HasLinkThing, Link, Node, Note, OddRelation1, OddRelation2, + Organization, Person, Place, Related, Restaurant, Tag, Team, TextLink, ) |