summaryrefslogtreecommitdiff
path: root/django/utils
diff options
context:
space:
mode:
Diffstat (limited to 'django/utils')
-rw-r--r--django/utils/crypto.py3
-rw-r--r--django/utils/deprecation.py11
-rw-r--r--django/utils/log.py3
-rw-r--r--django/utils/warnings.py12
4 files changed, 17 insertions, 12 deletions
diff --git a/django/utils/crypto.py b/django/utils/crypto.py
index beadb146cb..519eedc115 100644
--- a/django/utils/crypto.py
+++ b/django/utils/crypto.py
@@ -8,8 +8,9 @@ import secrets
import warnings
from django.conf import settings
-from django.utils.deprecation import RemovedInDjango70Warning, django_file_prefixes
+from django.utils.deprecation import RemovedInDjango70Warning
from django.utils.encoding import force_bytes
+from django.utils.warnings import django_file_prefixes
class InvalidAlgorithm(ValueError):
diff --git a/django/utils/deprecation.py b/django/utils/deprecation.py
index 2832b98b59..9b15b4e2e7 100644
--- a/django/utils/deprecation.py
+++ b/django/utils/deprecation.py
@@ -1,22 +1,13 @@
import functools
import inspect
-import os
import warnings
from collections import Counter
from inspect import iscoroutinefunction, markcoroutinefunction
from asgiref.sync import sync_to_async
-import django
from django.utils.inspect import signature
-
-
-@functools.cache
-def django_file_prefixes():
- file = getattr(django, "__file__", None)
- if file is None:
- return ()
- return (os.path.join(os.path.dirname(file), ""),)
+from django.utils.warnings import django_file_prefixes
class RemovedInDjango70Warning(DeprecationWarning):
diff --git a/django/utils/log.py b/django/utils/log.py
index 6df00498bf..d37a9f530f 100644
--- a/django/utils/log.py
+++ b/django/utils/log.py
@@ -7,8 +7,9 @@ from django.conf import settings
from django.core import mail
from django.core.exceptions import ImproperlyConfigured
from django.core.management.color import color_style
-from django.utils.deprecation import RemovedInDjango70Warning, django_file_prefixes
+from django.utils.deprecation import RemovedInDjango70Warning
from django.utils.module_loading import import_string
+from django.utils.warnings import django_file_prefixes
request_logger = logging.getLogger("django.request")
diff --git a/django/utils/warnings.py b/django/utils/warnings.py
new file mode 100644
index 0000000000..ef052d0030
--- /dev/null
+++ b/django/utils/warnings.py
@@ -0,0 +1,12 @@
+import functools
+import os
+
+import django
+
+
+@functools.cache
+def django_file_prefixes():
+ file = getattr(django, "__file__", None)
+ if file is None:
+ return ()
+ return (os.path.join(os.path.dirname(file), ""),)