summaryrefslogtreecommitdiff
path: root/django/db/models/fields
diff options
context:
space:
mode:
Diffstat (limited to 'django/db/models/fields')
-rw-r--r--django/db/models/fields/files.py10
-rw-r--r--django/db/models/fields/related.py21
2 files changed, 16 insertions, 15 deletions
diff --git a/django/db/models/fields/files.py b/django/db/models/fields/files.py
index 301244bbef..5eb6e7845f 100644
--- a/django/db/models/fields/files.py
+++ b/django/db/models/fields/files.py
@@ -1,19 +1,19 @@
import datetime
-from inspect import getargspec
import os
import warnings
+from inspect import getargspec
from django import forms
-from django.db.models.fields import Field
from django.core import checks
from django.core.files.base import File
-from django.core.files.storage import default_storage
from django.core.files.images import ImageFile
+from django.core.files.storage import default_storage
from django.db.models import signals
-from django.utils.encoding import force_str, force_text
+from django.db.models.fields import Field
from django.utils import six
-from django.utils.translation import ugettext_lazy as _
from django.utils.deprecation import RemovedInDjango20Warning
+from django.utils.encoding import force_str, force_text
+from django.utils.translation import ugettext_lazy as _
class FieldFile(File):
diff --git a/django/db/models/fields/related.py b/django/db/models/fields/related.py
index 40e1028f1c..c045391aaa 100644
--- a/django/db/models/fields/related.py
+++ b/django/db/models/fields/related.py
@@ -1,27 +1,28 @@
from __future__ import unicode_literals
-from operator import attrgetter
import warnings
+from operator import attrgetter
+from django import forms
from django.apps import apps
-from django.core import checks
+from django.core import checks, exceptions
from django.core.exceptions import FieldDoesNotExist
from django.db import connection, connections, router, transaction
from django.db.backends import utils
-from django.db.models import signals, Q
-from django.db.models.deletion import SET_NULL, SET_DEFAULT, CASCADE
-from django.db.models.fields import (AutoField, Field, IntegerField,
- PositiveIntegerField, PositiveSmallIntegerField, BLANK_CHOICE_DASH)
+from django.db.models import Q, signals
+from django.db.models.deletion import CASCADE, SET_DEFAULT, SET_NULL
+from django.db.models.fields import (
+ BLANK_CHOICE_DASH, AutoField, Field, IntegerField, PositiveIntegerField,
+ PositiveSmallIntegerField,
+)
from django.db.models.lookups import IsNull
from django.db.models.query import QuerySet
from django.db.models.query_utils import PathInfo
-from django.utils.encoding import force_text, smart_text
from django.utils import six
from django.utils.deprecation import RemovedInDjango20Warning
+from django.utils.encoding import force_text, smart_text
+from django.utils.functional import cached_property, curry
from django.utils.translation import ugettext_lazy as _
-from django.utils.functional import curry, cached_property
-from django.core import exceptions
-from django import forms
RECURSIVE_RELATIONSHIP_CONSTANT = 'self'