Commit 100f28ed authored by Tim Graham's avatar Tim Graham
Browse files

[1.8.x] Sorted single letter imports per the latest version of isort. 

Backport of 1c8c0837 from master
parent ca051388

django/db/models/query.py

+2 −2
Original line number Diff line number Diff line
@@ -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

django/db/models/sql/query.py

+1 −1
Original line number Diff line number Diff line
@@ -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,

tests/aggregation/tests.py

+1 −1
Original line number Diff line number Diff line
@@ -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

tests/aggregation_regress/tests.py

+1 −1
Original line number Diff line number Diff line
@@ -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

tests/annotations/tests.py

+1 −1
Original line number Diff line number Diff line
@@ -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