From 13e0d03b13c42c112a5a8bb4a730b592275d6a94 Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Wed, 12 Apr 2006 03:33:48 +0000 Subject: [PATCH] magic-removal: Merged to [2681] git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2682 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/template/loader.py | 2 +- django/template/loader_tags.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/django/template/loader.py b/django/template/loader.py index 8339e48969..ebca582ef9 100644 --- a/django/template/loader.py +++ b/django/template/loader.py @@ -78,7 +78,7 @@ def get_template(template_name): """ return get_template_from_string(*find_template_source(template_name)) -def get_template_from_string(source, origin=None ): +def get_template_from_string(source, origin=None): """ Returns a compiled Template object for the given template code, handling template inheritance recursively. diff --git a/django/template/loader_tags.py b/django/template/loader_tags.py index 5aaef668c8..c2646038e1 100644 --- a/django/template/loader_tags.py +++ b/django/template/loader_tags.py @@ -51,9 +51,11 @@ class ExtendsNode(Node): 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)