Ticket #13049: extends_template.diff

django/template/loader_tags.py

@@ -99 +99 @@
             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)
+        except TemplateDoesNotExist, e:
+            if e.message == parent:
+                raise TemplateSyntaxError("Template %r cannot be extended, because it doesn't exist" % parent)
+            else:
+                raise
 
     def render(self, context):
         compiled_parent = self.get_parent(context)

django/template/debug.py

@@ -1 @@
-from django.template import Lexer, Parser, tag_re, NodeList, VariableNode, TemplateSyntaxError
+from django.template import Lexer, Parser, tag_re, NodeList, VariableNode, TemplateSyntaxError, TemplateDoesNotExist
 from django.utils.encoding import force_unicode
 from django.utils.html import escape
 from django.utils.safestring import SafeData, EscapeData
@@ -74 +74 @@
             if not hasattr(e, 'source'):
                 e.source = node.source
             raise
+        except TemplateDoesNotExist, e:
+            if not hasattr(e, 'source'):
+                e.source = node.source
+            raise
         except Exception, e:
             from sys import exc_info
             wrapped = TemplateSyntaxError(u'Caught an exception while rendering: %s' % force_unicode(e, errors='replace'))