Ticket #6691: templateloader.diff

django/template/loader_tags.py

@@ -1 +1 @@
 from django.template import TemplateSyntaxError, TemplateDoesNotExist, Variable
 from django.template import Library, Node, TextNode
-from django.template.loader import get_template, get_template_from_string, find_template_source
+from django.template.loader import get_template, find_template
 from django.conf import settings
 from django.utils.safestring import mark_safe
 
@@ -61 +61 @@
         if hasattr(parent, 'render'):
             return parent # parent is a Template object
         try:
-            source, origin = find_template_source(parent, self.template_dirs)
+            template = find_template(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, parent)
+            return template
 
     def render(self, context):
         compiled_parent = self.get_parent(context)

django/template/loader.py

@@ -40 +40 @@
     else:
         return None
 
-def find_template_source(name, dirs=None):
+def find_template(name, dirs=None):
     # Calculate template_source_loaders the first time the function is executed
     # because putting this logic in the module-level namespace may cause
     # circular import errors. See Django ticket #1292.
@@ -65 +65 @@
                 template_source_loaders.append(func)
     for loader in template_source_loaders:
         try:
-            source, display_name = loader(name, dirs)
-            return (source, make_origin(display_name, loader, name, dirs))
+            template = loader(name, dirs)
+
+            try:
+                template, display_name = template
+                origin = make_origin(display_name, loader, name, dirs)
+                template = Template(template, origin, name)
+            except TypeError:
+                pass
+
+            return template
         except TemplateDoesNotExist:
             pass
     raise TemplateDoesNotExist, name
@@ -76 +84 @@
     Returns a compiled Template object for the given template name,
     handling template inheritance recursively.
     """
-    source, origin = find_template_source(template_name)
-    template = get_template_from_string(source, origin, template_name)
-    return template
+    return find_template(template_name)
 
 def get_template_from_string(source, origin=None, name=None):
     """