Ticket #2799: inclusion_tag.diff

django/template/__init__.py

@@ -839 +839 @@
         self.tag(func.__name__, compile_func)
         return func
 
-    def inclusion_tag(self, file_name, context_class=Context, takes_context=False):
+    def inclusion_tag(self, file_name, context_class=Context, takes_context=False, cache_timeout=0, cleanup_sender=None, cleanup_signal=None):
         def dec(func):
             params, xx, xxx, defaults = getargspec(func)
             if takes_context:
@@ -848 +848 @@
                 else:
                     raise TemplateSyntaxError, "Any tag function decorated with takes_context=True must have a first argument of 'context'"
 
+            use_cache = cache_timeout > 0
+            if use_cache:
+                from django.core.cache import cache
+                cache_id = "%s.%s" % (func.__module__, func.func_name)
+
             class InclusionNode(Node):
                 def __init__(self, vars_to_resolve):
                     self.vars_to_resolve = vars_to_resolve
 
                 def render(self, context):
+                    
+                    if use_cache:
+                        output = cache.get(cache_id)
+                        if output is not None:
+                            return output
+
                     resolved_vars = [resolve_variable(var, context) for var in self.vars_to_resolve]
                     if takes_context:
                         args = [context] + resolved_vars
@@ -865 +876 @@
                         from django.template.loader import get_template
                         t = get_template(file_name)
                         self.nodelist = t.nodelist
-                    return self.nodelist.render(context_class(dict))
+                    output = self.nodelist.render(context_class(dict))
+                    if use_cache:
+                        cache.set(cache_id, output, cache_timeout)
+                    return output
 
             compile_func = curry(generic_tag_compiler, params, defaults, func.__name__, InclusionNode)
             compile_func.__doc__ = func.__doc__
             self.tag(func.__name__, compile_func)
+            
+            if use_cache and cleanup_sender and cleanup_signal:
+                def cleanup():
+                    cache.delete(cache_id)
+                from django.dispatch import dispatcher
+                dispatcher.connect(cleanup, signal=cleanup_signal, sender=cleanup_sender, weak=False)
             return func
         return dec