Ticket #6201: cache_tag.diff

django/templatetags/cache.py

@@ -1 @@
-
-
+
-from django.core.cache import cache
-from django.utils.encoding import force_unicode
-
@@ -13 +12 @@
-        self.vary_on = vary_on
-
-    def render(self, context):
+        try:
+            self.expire_time = int(self.expire_time)
+        except ValueError:
+            try:
+                self.expire_time = int(Variable(self.expire_time).resolve(context))
+            except (ValueError, TypeError, VariableDoesNotExist):
+                raise TemplateSyntaxError(u"Cannot resolve cache timeout! '%s' must be an integer." % self.expire_time)
-        # Build a unicode key for this fragment and all vary-on's.
-        cache_key = u':'.join([self.fragment_name] + \
-resolve_variable(var, 
+Variable(var).resolve(
-        value = cache.get(cache_key)
-        if value is None:
-            value = self.nodelist.render(context)
@@ -48 +54 @@
-    tokens = token.contents.split()
-    if len(tokens) < 3:
-        raise TemplateSyntaxError(u"'%r' tag requires at least 2 arguments." % tokens[0])
-
-
-
-
-
+
-
-register.tag('cache', do_cache)

tests/regressiontests/templates/tests.py

@@ -877 +877 @@
-            'cache04' : ('{% load cache %}{% cache 2 test %}cache04{% endcache %}', {}, 'cache03'),
-            'cache05' : ('{% load cache %}{% cache 2 test foo %}cache05{% endcache %}', {'foo': 1}, 'cache05'),
-            'cache06' : ('{% load cache %}{% cache 2 test foo %}cache06{% endcache %}', {'foo': 2}, 'cache06'),
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
-
-            ### AUTOESCAPE TAG ##############################################
-            'autoescape-tag01': ("{% autoescape off %}hello{% endautoescape %}", {}, "hello"),