summaryrefslogtreecommitdiff
path: root/django/db/models
diff options
context:
space:
mode:
Diffstat (limited to 'django/db/models')
-rw-r--r--django/db/models/fields/__init__.py3
-rw-r--r--django/db/models/fields/json.py3
-rw-r--r--django/db/models/query.py3
-rw-r--r--django/db/models/sql/compiler.py3
-rw-r--r--django/db/models/sql/query.py3
5 files changed, 10 insertions, 5 deletions
diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py
index 16f1071396..0a12d3631c 100644
--- a/django/db/models/fields/__init__.py
+++ b/django/db/models/fields/__init__.py
@@ -32,12 +32,13 @@ from django.utils.dateparse import (
parse_duration,
parse_time,
)
-from django.utils.deprecation import RemovedInDjango70Warning, django_file_prefixes
+from django.utils.deprecation import RemovedInDjango70Warning
from django.utils.duration import duration_string
from django.utils.functional import Promise, cached_property
from django.utils.ipv6 import MAX_IPV6_ADDRESS_LENGTH, clean_ipv6_address
from django.utils.text import capfirst
from django.utils.translation import gettext_lazy as _
+from django.utils.warnings import django_file_prefixes
__all__ = [
"AutoField",
diff --git a/django/db/models/fields/json.py b/django/db/models/fields/json.py
index 6478c57aae..2d5f51d4f3 100644
--- a/django/db/models/fields/json.py
+++ b/django/db/models/fields/json.py
@@ -12,8 +12,9 @@ from django.db.models.lookups import (
PostgresOperatorLookup,
Transform,
)
-from django.utils.deprecation import RemovedInDjango70Warning, django_file_prefixes
+from django.utils.deprecation import RemovedInDjango70Warning
from django.utils.translation import gettext_lazy as _
+from django.utils.warnings import django_file_prefixes
from . import Field
from .mixins import CheckFieldDefaultMixin
diff --git a/django/db/models/query.py b/django/db/models/query.py
index a206804469..e4b37d1c52 100644
--- a/django/db/models/query.py
+++ b/django/db/models/query.py
@@ -37,8 +37,9 @@ from django.db.models.utils import (
resolve_callables,
)
from django.utils import timezone
-from django.utils.deprecation import RemovedInDjango70Warning, django_file_prefixes
+from django.utils.deprecation import RemovedInDjango70Warning
from django.utils.functional import cached_property
+from django.utils.warnings import django_file_prefixes
# The maximum number of results to fetch in a get() query.
MAX_GET_RESULTS = 21
diff --git a/django/db/models/sql/compiler.py b/django/db/models/sql/compiler.py
index bcf28f9ae1..2ce6edefe5 100644
--- a/django/db/models/sql/compiler.py
+++ b/django/db/models/sql/compiler.py
@@ -24,10 +24,11 @@ from django.db.models.sql.constants import (
)
from django.db.models.sql.query import Query, get_order_dir
from django.db.transaction import TransactionManagementError
-from django.utils.deprecation import RemovedInDjango70Warning, django_file_prefixes
+from django.utils.deprecation import RemovedInDjango70Warning
from django.utils.functional import cached_property
from django.utils.hashable import make_hashable
from django.utils.regex_helper import _lazy_re_compile
+from django.utils.warnings import django_file_prefixes
class PositionRef(Ref):
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py
index 22dd479d67..adf0663beb 100644
--- a/django/db/models/sql/query.py
+++ b/django/db/models/sql/query.py
@@ -43,10 +43,11 @@ from django.db.models.query_utils import (
from django.db.models.sql.constants import INNER, LOUTER, ORDER_DIR, SINGLE
from django.db.models.sql.datastructures import BaseTable, Empty, Join, MultiJoin
from django.db.models.sql.where import AND, OR, ExtraWhere, NothingNode, WhereNode
-from django.utils.deprecation import RemovedInDjango70Warning, django_file_prefixes
+from django.utils.deprecation import RemovedInDjango70Warning
from django.utils.functional import cached_property
from django.utils.regex_helper import _lazy_re_compile
from django.utils.tree import Node
+from django.utils.warnings import django_file_prefixes
__all__ = ["Query", "RawQuery"]