Ticket #8116: 8116-r11637-IncludedTemplateDoesNotExist.diff

django/template/__init__.py

@@ -121 +121 @@
 class TemplateDoesNotExist(Exception):
     pass
 
+class IncludedTemplateDoesNotExist(TemplateDoesNotExist):
+    pass
+
 class TemplateEncodingError(Exception):
     pass
 

django/template/loader.py

@@ -21 +21 @@
 # installed, because pkg_resources is necessary to read eggs.
 
 from django.core.exceptions import ImproperlyConfigured
-from django.template import Origin, Template, Context, TemplateDoesNotExist, add_to_builtins
+from django.template import Origin, Template, Context, TemplateDoesNotExist, IncludedTemplateDoesNotExist, add_to_builtins
 from django.utils.importlib import import_module
 from django.conf import settings
 
@@ -79 +79 @@
     handling template inheritance recursively.
     """
     source, origin = find_template_source(template_name)
-    template = get_template_from_string(source, origin, template_name)
+    try:
+        template = get_template_from_string(source, origin, template_name)
+    except TemplateDoesNotExist, included_template_name:
+        raise IncludedTemplateDoesNotExist, included_template_name
     return template
 
 def get_template_from_string(source, origin=None, name=None):
@@ -112 +115 @@
     for template_name in template_name_list:
         try:
             return get_template(template_name)
-        except TemplateDoesNotExist:
+        except TemplateDoesNotExist, e:
+            if isinstance(e, IncludedTemplateDoesNotExist):
+                raise
             continue
     # If we get here, none of the templates could be loaded
     raise TemplateDoesNotExist, ', '.join(template_name_list)