diff options
| author | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2023-09-11 13:04:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-11 13:04:32 +0200 |
| commit | a7c73b944f51d6c92ec876fd7e0a171e7c01657d (patch) | |
| tree | 72f2b30825fed94f14b74a1d4267e1dfda352fe5 /django/conf | |
| parent | 938170008ea48dff8f89b0839998a1eec939ddf4 (diff) | |
Fixed #34821 -- Prevented DEFAULT_FILE_STORAGE/STATICFILES_STORAGE settings from mutating the main STORAGES.
Regression in 6b965c600054f970bdf94017ecf2e0e6e0a4326b.
Diffstat (limited to 'django/conf')
| -rw-r--r-- | django/conf/__init__.py | 10 |
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. |