Commit 5fbb5426 authored by Tim Graham's avatar Tim Graham
Browse files

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

Backport of 1c8c0837 from master
parent 844f071c

django/db/models/__init__.py

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ from django.db.models.deletion import ( # NOQA 
    CASCADE, DO_NOTHING, PROTECT, SET, SET_DEFAULT, SET_NULL, ProtectedError,

)

from django.db.models.expressions import (  # NOQA

    F, Case, Expression, ExpressionWrapper, Func, Value, When,

    Case, Expression, ExpressionWrapper, F, Func, Value, When,

)

from django.db.models.fields import *  # NOQA

from django.db.models.fields.files import FileField, ImageField  # NOQA
@@ -15,7 +15,7 @@ from django.db.models.fields.proxy import OrderWrt # NOQA 
from django.db.models.fields.subclassing import SubfieldBase  # NOQA

from django.db.models.lookups import Lookup, Transform  # NOQA

from django.db.models.manager import Manager  # NOQA

from django.db.models.query import Q, Prefetch, QuerySet  # NOQA

from django.db.models.query import Prefetch, Q, QuerySet  # NOQA



# Imports that would create circular imports if sorted

from django.db.models.base import Model  # NOQA isort:skip

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

from django.db.models.query_utils import (

    Q, InvalidQuery, check_rel_lookup_compatibility, deferred_class_factory,

    InvalidQuery, Q, check_rel_lookup_compatibility, 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
@@ -19,7 +19,7 @@ from django.db.models.constants import LOOKUP_SEP 
from django.db.models.expressions import Col, Ref

from django.db.models.fields.related_lookups import MultiColSource

from django.db.models.query_utils import (

    Q, PathInfo, check_rel_lookup_compatibility, refs_expression,

    PathInfo, Q, check_rel_lookup_compatibility, 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, DurationField, FloatField, Func,

    Aggregate, Avg, Count, DecimalField, DurationField, 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
@@ -9,7 +9,7 @@ from django.contrib.contenttypes.models import ContentType 
from django.core.exceptions import FieldError

from django.db import connection

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, skipUnlessAnyDBFeature, skipUnlessDBFeature

from django.test.utils import Approximate