Ticket #9874: template_cache.diff

django1.02/django/template/loader_tags.py

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

django1.02/django/template/loader.py

@@ -25 +25 @@
 from django.conf import settings
 
 template_source_loaders = None
+template_cache = {}
 
 class LoaderOrigin(Origin):
     def __init__(self, display_name, loader, name, dirs):
@@ -77 +78 @@
     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)
+    global template_cache
+    if template_name in template_cache:
+        template = template_cache[template_name]
+    else:
+        source, origin = find_template_source(template_name)
+        template = get_template_from_string(source, origin, template_name)
+        template_cache[template_name] = template
     return template
 
 def get_template_from_string(source, origin=None, name=None):