From 100f28ed287adff6cc83206ce2a93185beb9350d Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Mon, 28 Mar 2016 11:19:25 -0400 Subject: [PATCH] [1.8.x] Sorted single letter imports per the latest version of isort. Backport of 1c8c0837c61a9e9eb2129df29f75be92e47e926c from master --- django/db/models/query.py | 4 ++-- django/db/models/sql/query.py | 2 +- tests/aggregation/tests.py | 2 +- tests/aggregation_regress/tests.py | 2 +- tests/annotations/tests.py | 2 +- tests/delete/tests.py | 4 ++-- tests/expressions/tests.py | 2 +- tests/expressions_case/tests.py | 2 +- tests/generic_relations_regress/tests.py | 2 +- tests/gis_tests/test_measure.py | 2 +- tests/queries/tests.py | 6 +++--- tests/select_related_regress/tests.py | 2 +- tests/update/tests.py | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) diff --git a/django/db/models/query.py b/django/db/models/query.py index 0a73684a78..b6ef0c8213 100644 --- a/django/db/models/query.py +++ b/django/db/models/query.py @@ -16,10 +16,10 @@ from django.db import ( from django.db.models import sql from django.db.models.constants import LOOKUP_SEP from django.db.models.deletion import Collector -from django.db.models.expressions import F, Date, DateTime +from django.db.models.expressions import Date, DateTime, F from django.db.models.fields import AutoField, Empty from django.db.models.query_utils import ( - Q, InvalidQuery, deferred_class_factory, + InvalidQuery, Q, deferred_class_factory, ) from django.db.models.sql.constants import CURSOR from django.utils import six, timezone diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py index 40b6cc57a1..d267e8dd73 100644 --- a/django/db/models/sql/query.py +++ b/django/db/models/sql/query.py @@ -18,7 +18,7 @@ from django.db.models.aggregates import Count from django.db.models.constants import LOOKUP_SEP from django.db.models.expressions import Col, Ref from django.db.models.query_utils import ( - Q, PathInfo, refs_aggregate, refs_expression, + PathInfo, Q, refs_aggregate, refs_expression, ) from django.db.models.sql.constants import ( INNER, LOUTER, ORDER_DIR, ORDER_PATTERN, QUERY_TERMS, SINGLE, diff --git a/tests/aggregation/tests.py b/tests/aggregation/tests.py index d9404ccfca..fc88cc5065 100644 --- a/tests/aggregation/tests.py +++ b/tests/aggregation/tests.py @@ -7,7 +7,7 @@ from decimal import Decimal from django.core.exceptions import FieldError from django.db import connection from django.db.models import ( - F, Aggregate, Avg, Count, DecimalField, FloatField, Func, IntegerField, + Aggregate, Avg, Count, DecimalField, F, FloatField, Func, IntegerField, Max, Min, Sum, Value, ) from django.test import TestCase, ignore_warnings diff --git a/tests/aggregation_regress/tests.py b/tests/aggregation_regress/tests.py index 0674d997ad..0d15b4aba3 100644 --- a/tests/aggregation_regress/tests.py +++ b/tests/aggregation_regress/tests.py @@ -8,7 +8,7 @@ from operator import attrgetter from django.contrib.contenttypes.models import ContentType from django.core.exceptions import FieldError from django.db.models import ( - F, Q, Avg, Count, Max, StdDev, Sum, Value, Variance, + Avg, Count, F, Max, Q, StdDev, Sum, Value, Variance, ) from django.test import TestCase, skipUnlessDBFeature from django.test.utils import Approximate diff --git a/tests/annotations/tests.py b/tests/annotations/tests.py index ce9ffe6992..72f9c1e1c4 100644 --- a/tests/annotations/tests.py +++ b/tests/annotations/tests.py @@ -5,7 +5,7 @@ from decimal import Decimal from django.core.exceptions import FieldDoesNotExist, FieldError from django.db.models import ( - F, BooleanField, CharField, Count, DateTimeField, ExpressionWrapper, Func, + BooleanField, CharField, Count, DateTimeField, ExpressionWrapper, F, Func, IntegerField, Sum, Value, ) from django.test import TestCase diff --git a/tests/delete/tests.py b/tests/delete/tests.py index a2b910ff5d..ce79efd2ec 100644 --- a/tests/delete/tests.py +++ b/tests/delete/tests.py @@ -8,8 +8,8 @@ from django.test import TestCase, skipIfDBFeature, skipUnlessDBFeature from django.utils.six.moves import range from .models import ( - A, M, MR, R, S, T, Avatar, Base, Child, HiddenUser, HiddenUserProfile, - M2MFrom, M2MTo, MRNull, Parent, RChild, User, create_a, get_default_r, + MR, A, Avatar, Base, Child, HiddenUser, HiddenUserProfile, M, M2MFrom, + M2MTo, MRNull, Parent, R, RChild, S, T, User, create_a, get_default_r, ) diff --git a/tests/expressions/tests.py b/tests/expressions/tests.py index 2d8b17db2d..9ff61baf2d 100644 --- a/tests/expressions/tests.py +++ b/tests/expressions/tests.py @@ -11,7 +11,7 @@ from django.db.models.aggregates import ( Avg, Count, Max, Min, StdDev, Sum, Variance, ) from django.db.models.expressions import ( - F, Case, Col, Date, DateTime, ExpressionWrapper, Func, OrderBy, Random, + Case, Col, Date, DateTime, ExpressionWrapper, F, Func, OrderBy, Random, RawSQL, Ref, Value, When, ) from django.db.models.functions import ( diff --git a/tests/expressions_case/tests.py b/tests/expressions_case/tests.py index 001e7f5c8d..a29e3bfb7e 100644 --- a/tests/expressions_case/tests.py +++ b/tests/expressions_case/tests.py @@ -8,7 +8,7 @@ from uuid import UUID from django.core.exceptions import FieldError from django.db import connection, models -from django.db.models import F, Q, Max, Min, Sum, Value +from django.db.models import F, Max, Min, Q, Sum, Value from django.db.models.expressions import Case, When from django.test import TestCase from django.utils import six diff --git a/tests/generic_relations_regress/tests.py b/tests/generic_relations_regress/tests.py index 0d78223725..1253c4c956 100644 --- a/tests/generic_relations_regress/tests.py +++ b/tests/generic_relations_regress/tests.py @@ -5,7 +5,7 @@ from django.forms.models import modelform_factory from django.test import TestCase, skipIfDBFeature from .models import ( - A, B, C, D, Address, Board, CharLink, Company, Contact, Content, Developer, + A, Address, B, Board, C, CharLink, Company, Contact, Content, D, Developer, Guild, HasLinkThing, Link, Node, Note, OddRelation1, OddRelation2, Organization, Person, Place, Related, Restaurant, Tag, Team, TextLink, ) diff --git a/tests/gis_tests/test_measure.py b/tests/gis_tests/test_measure.py index 771c10fe9d..4a7ca992c6 100644 --- a/tests/gis_tests/test_measure.py +++ b/tests/gis_tests/test_measure.py @@ -5,7 +5,7 @@ and conversions. Here are some tests. import unittest -from django.contrib.gis.measure import A, D, Area, Distance +from django.contrib.gis.measure import A, Area, D, Distance class DistanceTest(unittest.TestCase): diff --git a/tests/queries/tests.py b/tests/queries/tests.py index 5ebcc17df9..1f9fec7d0a 100644 --- a/tests/queries/tests.py +++ b/tests/queries/tests.py @@ -9,7 +9,7 @@ from operator import attrgetter from django.core.exceptions import FieldError from django.db import DEFAULT_DB_ALIAS, connection -from django.db.models import F, Q, Count +from django.db.models import Count, F, Q from django.db.models.sql.constants import LOUTER from django.db.models.sql.datastructures import EmptyResultSet from django.db.models.sql.where import EverythingNode, NothingNode, WhereNode @@ -20,7 +20,7 @@ from django.utils.deprecation import RemovedInDjango19Warning from django.utils.six.moves import range from .models import ( - FK1, X, Annotation, Article, Author, BaseA, Book, CategoryItem, + FK1, Annotation, Article, Author, BaseA, Book, CategoryItem, CategoryRelationship, Celebrity, Channel, Chapter, Child, ChildObjectA, Classroom, Company, Cover, CustomPk, CustomPkTag, Detail, DumbCategory, Eaten, Employment, ExtraInfo, Fan, Food, Identifier, Individual, Item, Job, @@ -32,7 +32,7 @@ from .models import ( RelatedIndividual, RelatedObject, Report, ReservedName, Responsibility, School, SharedConnection, SimpleCategory, SingleObject, SpecialCategory, Staff, StaffUser, Student, Tag, Task, Ticket21203Child, Ticket21203Parent, - Ticket23605A, Ticket23605B, Ticket23605C, TvChef, Valid, + Ticket23605A, Ticket23605B, Ticket23605C, TvChef, Valid, X, ) diff --git a/tests/select_related_regress/tests.py b/tests/select_related_regress/tests.py index d014123beb..74cc93fbcf 100644 --- a/tests/select_related_regress/tests.py +++ b/tests/select_related_regress/tests.py @@ -4,7 +4,7 @@ from django.test import TestCase from django.utils import six from .models import ( - A, B, C, Building, Chick, Child, Class, Client, ClientStatus, Connection, + A, B, Building, C, Chick, Child, Class, Client, ClientStatus, Connection, Country, Device, Enrollment, Hen, Item, Organizer, Person, Port, SpecialClient, State, Student, TUser, ) diff --git a/tests/update/tests.py b/tests/update/tests.py index 1ed316c958..010151d61e 100644 --- a/tests/update/tests.py +++ b/tests/update/tests.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals from django.test import TestCase -from .models import A, B, D, Bar, DataPoint, Foo, RelatedPoint +from .models import A, B, Bar, D, DataPoint, Foo, RelatedPoint class SimpleTest(TestCase):