Ticket #18260: cachetag.3.diff

django/templatetags/cache.py

@@ -9 +9 @@
 class CacheNode(Node):
     def __init__(self, nodelist, expire_time_var, fragment_name, vary_on):
         self.nodelist = nodelist
-        self.expire_time_var = Variable(expire_time_var)
+        self.expire_time_var = expire_time_var
         self.fragment_name = fragment_name
         self.vary_on = vary_on
 
@@ -17 +17 @@
         try:
             expire_time = self.expire_time_var.resolve(context)
         except VariableDoesNotExist:
-            raise TemplateSyntaxError('"cache" tag got an unknown variable: %r' % self.expire_time_var.var)
+            raise TemplateSyntaxError('"cache" tag got an unknown variable: %r' % self.expire_time_var.token)
         try:
             expire_time = int(expire_time)
         except (ValueError, TypeError):
             raise TemplateSyntaxError('"cache" tag got a non-integer timeout value: %r' % expire_time)
         # Build a unicode key for this fragment and all vary-on's.
-        args = hashlib.md5(u':'.join([urlquote(resolve_variable(var, context)) for var in self.vary_on]))
-        cache_key = 'template.cache.%s.%s' % (self.fragment_name, args.hexdigest())
+        args = hashlib.md5(u':'.join([urlquote(var.resolve(context)) for var in self.vary_on]))
+        cache_key = 'template.cache.%s.%s' % (self.fragment_name.resolve(context), args.hexdigest())
         value = cache.get(cache_key)
         if value is None:
             value = self.nodelist.render(context)
@@ -55 +55 @@
     """
     nodelist = parser.parse(('endcache',))
     parser.delete_first_token()
-    tokens = token.contents.split()
+    tokens = [parser.compile_filter(token) for token in token.split_contents()]
     if len(tokens) < 3:
         raise TemplateSyntaxError(u"'%r' tag requires at least 2 arguments." % tokens[0])
     return CacheNode(nodelist, tokens[1], tokens[2], tokens[3:])