summaryrefslogtreecommitdiff
path: root/django/conf/__init__.py
diff options
context:
space:
mode:
Diffstat (limited to 'django/conf/__init__.py')
-rw-r--r--django/conf/__init__.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/django/conf/__init__.py b/django/conf/__init__.py
index e03369d321..22f1eaba06 100644
--- a/django/conf/__init__.py
+++ b/django/conf/__init__.py
@@ -222,8 +222,9 @@ class Settings:
raise ImproperlyConfigured(
"DEFAULT_FILE_STORAGE/STORAGES are mutually exclusive."
)
- self.STORAGES[DEFAULT_STORAGE_ALIAS] = {
- "BACKEND": self.DEFAULT_FILE_STORAGE
+ self.STORAGES = {
+ **self.STORAGES,
+ DEFAULT_STORAGE_ALIAS: {"BACKEND": self.DEFAULT_FILE_STORAGE},
}
warnings.warn(DEFAULT_FILE_STORAGE_DEPRECATED_MSG, RemovedInDjango51Warning)
@@ -232,8 +233,9 @@ class Settings:
raise ImproperlyConfigured(
"STATICFILES_STORAGE/STORAGES are mutually exclusive."
)
- self.STORAGES[STATICFILES_STORAGE_ALIAS] = {
- "BACKEND": self.STATICFILES_STORAGE
+ self.STORAGES = {
+ **self.STORAGES,
+ STATICFILES_STORAGE_ALIAS: {"BACKEND": self.STATICFILES_STORAGE},
}
warnings.warn(STATICFILES_STORAGE_DEPRECATED_MSG, RemovedInDjango51Warning)
# RemovedInDjango51Warning.