diff options
| author | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2023-09-11 13:04:32 +0200 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2023-09-11 13:04:55 +0200 |
| commit | 97e8a2afb127fad8c71d084954a6bc38661375dd (patch) | |
| tree | 895dfc852f076518a3c72b4e56c73543415074eb /django/conf/__init__.py | |
| parent | 39cb3b08bc730e5ff8a10c2f2db1ac7458c4213f (diff) | |
[4.2.x] Fixed #34821 -- Prevented DEFAULT_FILE_STORAGE/STATICFILES_STORAGE settings from mutating the main STORAGES.
Regression in 6b965c600054f970bdf94017ecf2e0e6e0a4326b.
Backport of a7c73b944f51d6c92ec876fd7e0a171e7c01657d from main
Diffstat (limited to 'django/conf/__init__.py')
| -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 f63df722c2..72ec964d23 100644 --- a/django/conf/__init__.py +++ b/django/conf/__init__.py @@ -271,8 +271,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) @@ -281,8 +282,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. |