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

Fixed #16866 -- Clearer error message if empty list is passed to select_template. Thanks Silver_Ghost for report and patch. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16861 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Carl Meyer 2011-09-21 14:20:18 +00:00
parent 09a01435de
commit 75199e8f6d
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/template/loader.py
View File

@ -179,6 +179,8 @@ def render_to_string(template_name, dictionary=None, context_instance=None):
def select_template(template_name_list): def select_template(template_name_list):
"Given a list of template names, returns the first that can be loaded." "Given a list of template names, returns the first that can be loaded."
if not template_name_list:
raise TemplateDoesNotExist("No template names provided")
not_found = [] not_found = []
for template_name in template_name_list: for template_name in template_name_list:
try: try:

11
tests/regressiontests/templates/loaders.py
View File

@ -143,5 +143,16 @@ class RenderToStringTest(unittest.TestCase):
self.assertEqual(output, 'obj:after') self.assertEqual(output, 'obj:after')
self.assertEqual(context['obj'], 'before') self.assertEqual(context['obj'], 'before')
def test_empty_list(self):
self.assertRaisesRegexp(TemplateDoesNotExist,
'No template names provided$',
loader.render_to_string, [])
def test_select_templates_from_empty_list(self):
self.assertRaisesRegexp(TemplateDoesNotExist,
'No template names provided$',
loader.select_template, [])
if __name__ == "__main__": if __name__ == "__main__":
unittest.main() unittest.main()