Ticket #12787: 12787.diff

django/template/loaders/cached.py

@@ -37 +37 @@
         if template_name not in self.template_cache:
             template, origin = self.find_template(template_name, template_dirs)
             if not hasattr(template, 'render'):
-                template = get_template_from_string(template, origin, template_name)
+                try:
+                    template = get_template_from_string(template, origin, template_name)
+                except TemplateDoesNotExist:
+                    return template, origin
             self.template_cache[template_name] = template
         return self.template_cache[template_name], None
 

django/template/loader_tags.py

@@ -97 +97 @@
             raise TemplateSyntaxError(error_msg)
         if hasattr(parent, 'render'):
             return parent # parent is a Template object
-        try:
-            return get_template(parent)
-        except TemplateDoesNotExist:
-            raise TemplateSyntaxError("Template %r cannot be extended, because it doesn't exist" % parent)
+        return get_template(parent)
 
     def render(self, context):
         compiled_parent = self.get_parent(context)

django/template/loader.py

@@ -44 +44 @@
     def load_template(self, template_name, template_dirs=None):
         source, display_name = self.load_template_source(template_name, template_dirs)
         origin = make_origin(display_name, self.load_template_source, template_name, template_dirs)
-        template = get_template_from_string(source, origin, template_name)
-        return template, None
+        try:
+            template = get_template_from_string(source, origin, template_name)
+            return template, None
+        except TemplateDoesNotExist:
+            return source, display_name
 
     def load_template_source(self, template_name, template_dirs=None):
         """

tests/regressiontests/views/tests/debug.py

@@ -49 +49 @@
                     "Failed to find 'raise BrokenException' in last frame of traceback, instead found: %s" % 
                         raising_loc) 
 
+    def test_extends_error(self):
+        try:
+            self.client.get(reverse('test_extends'))
+        except TemplateSyntaxError, e:
+            self.assertEquals(e.args[0], "Caught TemplateDoesNotExist while rendering: missing.html")
+
+

tests/regressiontests/views/views.py

@@ -57 +57 @@
     return render_to_response('debug/template_exception.html',
         {'arg': except_args[int(n)]})
 
+def test_extends(request):
+    return render_to_response('debug/test_extends_error.html')
+
+

tests/regressiontests/views/urls.py

@@ -110 +110 @@
 urlpatterns += patterns('regressiontests.views.views',
     url(r'view_exception/(?P<n>\d+)/$', 'view_exception', name='view_exception'),
     url(r'template_exception/(?P<n>\d+)/$', 'template_exception', name='template_exception'),
+    url(r'test_extends_error/$', 'test_extends', name='test_extends'),
+
 )

tests/regressiontests/views/templates/debug/test_extends_error.html

@@ +1 @@
+{% extends "debug/broken_base.html" %}

tests/regressiontests/views/templates/debug/broken_base.html

@@ +1 @@
+{% include "missing.html" %}