p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed #24685 -- Fixed check for template name unicity. 

Thanks Preston Timmons for the report.
This commit is contained in:
Aymeric Augustin 2015-05-03 21:42:56 +02:00
parent db0a0c4b8a
commit 1563b897c4
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/template/utils.py
View File

@ -50,6 +50,7 @@ class EngineHandler(object):
] ]
templates = OrderedDict() templates = OrderedDict()
backend_names = []
for tpl in self._templates: for tpl in self._templates:
tpl = tpl.copy() tpl = tpl.copy()
try: try:
@ -68,8 +69,9 @@ class EngineHandler(object):
tpl.setdefault('OPTIONS', {}) tpl.setdefault('OPTIONS', {})
templates[tpl['NAME']] = tpl 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] duplicates = [alias for alias, count in counts.most_common() if count > 1]
if duplicates: if duplicates:
raise ImproperlyConfigured( raise ImproperlyConfigured(

9
tests/template_backends/test_utils.py
View File

@ -35,3 +35,12 @@ class TemplateStringsTests(SimpleTestCase):
engines.all() engines.all()
with self.assertRaises(ImproperlyConfigured): with self.assertRaises(ImproperlyConfigured):
engines.all() engines.all()
@override_settings(TEMPLATES=[{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
}, {
'BACKEND': 'django.template.backends.django.DjangoTemplates',
}])
def test_backend_names_must_be_unique(self):
with self.assertRaises(ImproperlyConfigured):
engines.all()