summaryrefslogtreecommitdiff
path: root/django/template
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2015-05-03 21:42:56 +0200
committerAymeric Augustin <aymeric.augustin@m4x.org>2015-05-04 07:39:28 +0200
commit1f0a6082ec42db09a0c2ead3227150b833a73168 (patch)
tree7738b8bd4fb63f05cc783163df28b05ce7f7872f /django/template
parent0c79932881a5b10f83a68a67dc15d2928f40e35d (diff)
[1.8.x] Fixed #24685 -- Fixed check for template name unicity.
Thanks Preston Timmons for the report. Backport of 1563b89 from master
Diffstat (limited to 'django/template')
-rw-r--r--django/template/utils.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/django/template/utils.py b/django/template/utils.py
index 514df91a0c..ea72a8c5b1 100644
--- a/django/template/utils.py
+++ b/django/template/utils.py
@@ -50,6 +50,7 @@ class EngineHandler(object):
]
templates = OrderedDict()
+ backend_names = []
for tpl in self._templates:
tpl = tpl.copy()
try:
@@ -68,8 +69,9 @@ class EngineHandler(object):
tpl.setdefault('OPTIONS', {})
templates[tpl['NAME']] = tpl
+ backend_names.append(tpl['NAME'])
- counts = Counter(list(templates))
+ counts = Counter(backend_names)
duplicates = [alias for alias, count in counts.most_common() if count > 1]
if duplicates:
raise ImproperlyConfigured(