Ticket #4250: allow-lists-for-templates.2.patch

C:/Python24/Lib/site-packages/django/views/generic/list_detail.py

@@ -117 +117 @@
         template_name_list = [getattr(obj, template_name_field), template_name]
         t = template_loader.select_template(template_name_list)
     else:
-        t = template_loader.get_template(template_name)
+        t = template_loader.select_template(template_name)
     c = RequestContext(request, {
         template_object_name: obj,
     }, context_processors)

C:/Python24/Lib/site-packages/django/template/loader.py

@@ -109 +109 @@
     "Given a list of template names, returns the first that can be loaded."
     for template_name in template_name_list:
         try:
-            return get_template(template_name)
+            if len(template_name) == 1: #this can't be a complete template path, it must be a plain string
+                return get_template(template_name_list)
+            else:
+                return get_template(template_name)
         except TemplateDoesNotExist:
             continue
     # If we get here, none of the templates could be loaded
-    raise TemplateDoesNotExist, ', '.join(template_name_list)
+    if len(template_name_list[0]) == 1:
+        raise TemplateDoesNotExist, template_name_list
+    else:
+        raise TemplateDoesNotExist, ', '.join(template_name_list)
 
 add_to_builtins('django.template.loader_tags')