diff options
| author | Simon Charette <charette.s@gmail.com> | 2016-04-24 15:28:12 -0400 |
|---|---|---|
| committer | Simon Charette <charette.s@gmail.com> | 2016-04-24 22:17:36 -0400 |
| commit | a06fa6e7d35b408264ee0c2e19d2040ef54c5b4d (patch) | |
| tree | 53a38194f5d657c853f6aaf08a652f83c2777d75 /django | |
| parent | 7426c8fd82393404f1885606a646fda764b1e182 (diff) | |
[1.9.x] Fixed #26536 -- Preserved leading dashes of the cached template loader keys.
Thanks Anders Roos for the report.
Backport of bd145e7209a0e628cced10384bd6f62d65c0f211 from master
Diffstat (limited to 'django')
| -rw-r--r-- | django/template/loaders/cached.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/django/template/loaders/cached.py b/django/template/loaders/cached.py index 70c55feb51..1a3851d280 100644 --- a/django/template/loaders/cached.py +++ b/django/template/loaders/cached.py @@ -100,7 +100,7 @@ class Loader(BaseLoader): if template_dirs: dirs_prefix = self.generate_hash(template_dirs) - return ("%s-%s-%s" % (template_name, skip_prefix, dirs_prefix)).strip('-') + return '-'.join(filter(bool, [template_name, skip_prefix, dirs_prefix])) def generate_hash(self, values): return hashlib.sha1(force_bytes('|'.join(values))).hexdigest() |