summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
Diffstat (limited to 'django')
-rw-r--r--django/conf/__init__.py93
-rw-r--r--django/conf/global_settings.py6
-rw-r--r--django/core/files/storage/__init__.py17
-rw-r--r--django/core/files/storage/handler.py11
-rw-r--r--django/test/signals.py28
5 files changed, 2 insertions, 153 deletions
diff --git a/django/conf/__init__.py b/django/conf/__init__.py
index 22f1eaba06..6b5f044e34 100644
--- a/django/conf/__init__.py
+++ b/django/conf/__init__.py
@@ -16,21 +16,12 @@ from pathlib import Path
import django
from django.conf import global_settings
from django.core.exceptions import ImproperlyConfigured
-from django.utils.deprecation import RemovedInDjango51Warning
from django.utils.functional import LazyObject, empty
ENVIRONMENT_VARIABLE = "DJANGO_SETTINGS_MODULE"
DEFAULT_STORAGE_ALIAS = "default"
STATICFILES_STORAGE_ALIAS = "staticfiles"
-DEFAULT_FILE_STORAGE_DEPRECATED_MSG = (
- "The DEFAULT_FILE_STORAGE setting is deprecated. Use STORAGES instead."
-)
-
-STATICFILES_STORAGE_DEPRECATED_MSG = (
- "The STATICFILES_STORAGE setting is deprecated. Use STORAGES instead."
-)
-
class SettingsReference(str):
"""
@@ -155,22 +146,6 @@ class LazySettings(LazyObject):
if not filename.startswith(os.path.dirname(django.__file__)):
warnings.warn(message, category, stacklevel=2)
- # RemovedInDjango51Warning.
- @property
- def DEFAULT_FILE_STORAGE(self):
- self._show_deprecation_warning(
- DEFAULT_FILE_STORAGE_DEPRECATED_MSG, RemovedInDjango51Warning
- )
- return self.__getattr__("DEFAULT_FILE_STORAGE")
-
- # RemovedInDjango51Warning.
- @property
- def STATICFILES_STORAGE(self):
- self._show_deprecation_warning(
- STATICFILES_STORAGE_DEPRECATED_MSG, RemovedInDjango51Warning
- )
- return self.__getattr__("STATICFILES_STORAGE")
-
class Settings:
def __init__(self, settings_module):
@@ -217,40 +192,6 @@ class Settings:
os.environ["TZ"] = self.TIME_ZONE
time.tzset()
- if self.is_overridden("DEFAULT_FILE_STORAGE"):
- if self.is_overridden("STORAGES"):
- raise ImproperlyConfigured(
- "DEFAULT_FILE_STORAGE/STORAGES are mutually exclusive."
- )
- self.STORAGES = {
- **self.STORAGES,
- DEFAULT_STORAGE_ALIAS: {"BACKEND": self.DEFAULT_FILE_STORAGE},
- }
- warnings.warn(DEFAULT_FILE_STORAGE_DEPRECATED_MSG, RemovedInDjango51Warning)
-
- if self.is_overridden("STATICFILES_STORAGE"):
- if self.is_overridden("STORAGES"):
- raise ImproperlyConfigured(
- "STATICFILES_STORAGE/STORAGES are mutually exclusive."
- )
- self.STORAGES = {
- **self.STORAGES,
- STATICFILES_STORAGE_ALIAS: {"BACKEND": self.STATICFILES_STORAGE},
- }
- warnings.warn(STATICFILES_STORAGE_DEPRECATED_MSG, RemovedInDjango51Warning)
- # RemovedInDjango51Warning.
- if self.is_overridden("STORAGES"):
- setattr(
- self,
- "DEFAULT_FILE_STORAGE",
- self.STORAGES.get(DEFAULT_STORAGE_ALIAS, {}).get("BACKEND"),
- )
- setattr(
- self,
- "STATICFILES_STORAGE",
- self.STORAGES.get(STATICFILES_STORAGE_ALIAS, {}).get("BACKEND"),
- )
-
def is_overridden(self, setting):
return setting in self._explicit_settings
@@ -283,41 +224,7 @@ class UserSettingsHolder:
def __setattr__(self, name, value):
self._deleted.discard(name)
- if name == "DEFAULT_FILE_STORAGE":
- self.STORAGES[DEFAULT_STORAGE_ALIAS] = {
- "BACKEND": self.DEFAULT_FILE_STORAGE
- }
- warnings.warn(DEFAULT_FILE_STORAGE_DEPRECATED_MSG, RemovedInDjango51Warning)
- if name == "STATICFILES_STORAGE":
- self.STORAGES[STATICFILES_STORAGE_ALIAS] = {
- "BACKEND": self.STATICFILES_STORAGE
- }
- warnings.warn(STATICFILES_STORAGE_DEPRECATED_MSG, RemovedInDjango51Warning)
super().__setattr__(name, value)
- # RemovedInDjango51Warning.
- if name == "STORAGES":
- if default_file_storage := self.STORAGES.get(DEFAULT_STORAGE_ALIAS):
- super().__setattr__(
- "DEFAULT_FILE_STORAGE", default_file_storage.get("BACKEND")
- )
- else:
- self.STORAGES.setdefault(
- DEFAULT_STORAGE_ALIAS,
- {"BACKEND": "django.core.files.storage.FileSystemStorage"},
- )
- if staticfiles_storage := self.STORAGES.get(STATICFILES_STORAGE_ALIAS):
- super().__setattr__(
- "STATICFILES_STORAGE", staticfiles_storage.get("BACKEND")
- )
- else:
- self.STORAGES.setdefault(
- STATICFILES_STORAGE_ALIAS,
- {
- "BACKEND": (
- "django.contrib.staticfiles.storage.StaticFilesStorage"
- ),
- },
- )
def __delattr__(self, name):
self._deleted.add(name)
diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py
index 01f9b57fb2..6b91c6a716 100644
--- a/django/conf/global_settings.py
+++ b/django/conf/global_settings.py
@@ -268,9 +268,6 @@ SECRET_KEY = ""
# secret key rotation.
SECRET_KEY_FALLBACKS = []
-# Default file storage mechanism that holds media.
-DEFAULT_FILE_STORAGE = "django.core.files.storage.FileSystemStorage"
-
STORAGES = {
"default": {
"BACKEND": "django.core.files.storage.FileSystemStorage",
@@ -626,9 +623,6 @@ FIXTURE_DIRS = []
# A list of locations of additional static files
STATICFILES_DIRS = []
-# The default file storage backend used during the build process
-STATICFILES_STORAGE = "django.contrib.staticfiles.storage.StaticFilesStorage"
-
# List of finder classes that know how to find static files in
# various locations.
STATICFILES_FINDERS = [
diff --git a/django/core/files/storage/__init__.py b/django/core/files/storage/__init__.py
index 267f71ba37..a236cab3f8 100644
--- a/django/core/files/storage/__init__.py
+++ b/django/core/files/storage/__init__.py
@@ -1,9 +1,5 @@
-import warnings
-
-from django.conf import DEFAULT_STORAGE_ALIAS, settings
-from django.utils.deprecation import RemovedInDjango51Warning
+from django.conf import DEFAULT_STORAGE_ALIAS
from django.utils.functional import LazyObject
-from django.utils.module_loading import import_string
from .base import Storage
from .filesystem import FileSystemStorage
@@ -16,22 +12,11 @@ __all__ = (
"Storage",
"DefaultStorage",
"default_storage",
- "get_storage_class",
"InvalidStorageError",
"StorageHandler",
"storages",
)
-GET_STORAGE_CLASS_DEPRECATED_MSG = (
- "django.core.files.storage.get_storage_class is deprecated in favor of "
- "using django.core.files.storage.storages."
-)
-
-
-def get_storage_class(import_path=None):
- warnings.warn(GET_STORAGE_CLASS_DEPRECATED_MSG, RemovedInDjango51Warning)
- return import_string(import_path or settings.DEFAULT_FILE_STORAGE)
-
class DefaultStorage(LazyObject):
def _setup(self):
diff --git a/django/core/files/storage/handler.py b/django/core/files/storage/handler.py
index ad2054c837..ca379c9f5f 100644
--- a/django/core/files/storage/handler.py
+++ b/django/core/files/storage/handler.py
@@ -1,4 +1,4 @@
-from django.conf import DEFAULT_STORAGE_ALIAS, STATICFILES_STORAGE_ALIAS, settings
+from django.conf import settings
from django.core.exceptions import ImproperlyConfigured
from django.utils.functional import cached_property
from django.utils.module_loading import import_string
@@ -19,15 +19,6 @@ class StorageHandler:
def backends(self):
if self._backends is None:
self._backends = settings.STORAGES.copy()
- # RemovedInDjango51Warning.
- if settings.is_overridden("DEFAULT_FILE_STORAGE"):
- self._backends[DEFAULT_STORAGE_ALIAS] = {
- "BACKEND": settings.DEFAULT_FILE_STORAGE
- }
- if settings.is_overridden("STATICFILES_STORAGE"):
- self._backends[STATICFILES_STORAGE_ALIAS] = {
- "BACKEND": settings.STATICFILES_STORAGE
- }
return self._backends
def __getitem__(self, alias):
diff --git a/django/test/signals.py b/django/test/signals.py
index c16f4aa5ee..e531cd72f5 100644
--- a/django/test/signals.py
+++ b/django/test/signals.py
@@ -13,7 +13,6 @@ from django.dispatch import Signal, receiver
from django.utils import timezone
from django.utils.formats import FORMAT_SETTINGS, reset_format_cache
from django.utils.functional import empty
-from django.utils.module_loading import import_string
template_rendered = Signal()
@@ -161,21 +160,6 @@ def localize_settings_changed(*, setting, **kwargs):
reset_format_cache()
-# RemovedInDjango51Warning.
-@receiver(setting_changed)
-def file_storage_changed(*, setting, **kwargs):
- if setting == "DEFAULT_FILE_STORAGE":
- from django.conf import DEFAULT_STORAGE_ALIAS
- from django.core.files.storage import default_storage, storages
-
- try:
- del storages.backends
- except AttributeError:
- pass
- storages._storages[DEFAULT_STORAGE_ALIAS] = import_string(kwargs["value"])()
- default_storage._wrapped = empty
-
-
@receiver(setting_changed)
def complex_setting_changed(*, enter, setting, **kwargs):
if enter and setting in COMPLEX_OVERRIDE_SETTINGS:
@@ -199,7 +183,6 @@ def root_urlconf_changed(*, setting, **kwargs):
@receiver(setting_changed)
def static_storage_changed(*, setting, **kwargs):
if setting in {
- "STATICFILES_STORAGE",
"STATIC_ROOT",
"STATIC_URL",
}:
@@ -207,17 +190,6 @@ def static_storage_changed(*, setting, **kwargs):
staticfiles_storage._wrapped = empty
- # RemovedInDjango51Warning.
- if setting == "STATICFILES_STORAGE":
- from django.conf import STATICFILES_STORAGE_ALIAS
- from django.core.files.storage import storages
-
- try:
- del storages.backends
- except AttributeError:
- pass
- storages._storages[STATICFILES_STORAGE_ALIAS] = import_string(kwargs["value"])()
-
@receiver(setting_changed)
def static_finders_changed(*, setting, **kwargs):
generated by cgit v1.3 (git 2.53.0) at 2026-08-17 19:55:18 +0000