Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #1531 -- Fixed eager exception catching that caused the templat…

…e system to report a base template didn't exist when indeed it does exist but contains an {% include %} of a nonexisting template

git-svn-id: http://code.djangoproject.com/svn/django/trunk@2681 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 853ee34191b6d49bf19743b4ed4feb779ff66f1a 1 parent c862e43
@adrianholovaty adrianholovaty authored
Showing with 3 additions and 1 deletion.
  1. +3 −1 django/core/template/loader_tags.py
View
4 django/core/template/loader_tags.py
@@ -50,9 +50,11 @@ def get_parent(self, context):
error_msg += " Got this from the %r variable." % self.parent_name_expr #TODO nice repr.
raise TemplateSyntaxError, error_msg
try:
- return get_template_from_string(*find_template_source(parent, self.template_dirs))
+ source, origin = find_template_source(parent, self.template_dirs)
except TemplateDoesNotExist:
raise TemplateSyntaxError, "Template %r cannot be extended, because it doesn't exist" % parent
+ else:
+ return get_template_from_string(source, origin)
def render(self, context):
compiled_parent = self.get_parent(context)
Please sign in to comment.
Something went wrong with that request. Please try again.