summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorMariusz Felisiak <felisiak.mariusz@gmail.com>2021-04-21 09:41:37 +0200
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2021-04-21 09:42:43 +0200
commit1cc2eaf02d2aa64f7ca4ef52f3d9f13381540007 (patch)
treee4e25c1c63085c496de17fbbddf27dbdd0c61451 /django
parent54d5bfa9c5eb3e2936a0e382724869867059fad3 (diff)
[3.2.x] Fixed #32665 -- Fixed caches system check crash when STATICFILES_DIRS is a list of 2-tuples.
Thanks Jared Lockhart for the report. Regression in c36075ac1dddfa986340b1a5e15fe48833322372. Backport of 34d1905712d33e72c76b3a55a4fc24abbd11be6c from main
Diffstat (limited to 'django')
-rw-r--r--django/core/checks/caches.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/django/core/checks/caches.py b/django/core/checks/caches.py
index 4baa23aeb6..b755e0035a 100644
--- a/django/core/checks/caches.py
+++ b/django/core/checks/caches.py
@@ -27,10 +27,11 @@ def check_cache_location_not_exposed(app_configs, **kwargs):
if not setting:
continue
if name == 'STATICFILES_DIRS':
- paths = {
- pathlib.Path(staticfiles_dir).resolve()
- for staticfiles_dir in setting
- }
+ paths = set()
+ for staticfiles_dir in setting:
+ if isinstance(staticfiles_dir, (list, tuple)):
+ _, staticfiles_dir = staticfiles_dir
+ paths.add(pathlib.Path(staticfiles_dir).resolve())
else:
paths = {pathlib.Path(setting).resolve()}
for alias in settings.CACHES: