Ticket #8116: 8116.diff

django/template/base.py

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

django/template/loader.py

@@ -26 +26 @@
 # installed, because pkg_resources is necessary to read eggs.
 
 from django.core.exceptions import ImproperlyConfigured
-from django.template.base import Origin, Template, Context, TemplateDoesNotExist, add_to_builtins
+from django.template.base import (Origin, Template, Context,
+                                  TemplateDoesNotExist,
+                                  IncludedTemplateDoesNotExist,
+                                  add_to_builtins)
 from django.utils.importlib import import_module
 from django.conf import settings
 
@@ -157 +160 @@
     template, origin = find_template(template_name)
     if not hasattr(template, 'render'):
         # template needs to be compiled
-        template = get_template_from_string(template, origin, template_name)
+        try:
+            template = get_template_from_string(template, 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):
@@ -190 +196 @@
     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))