Ticket #18260: cachetag5.diff

django/templatetags/cache.py

@@ -2 +2 @@
 
 import hashlib
 from django.template import Library, Node, TemplateSyntaxError, Variable, VariableDoesNotExist
-from django.template import resolve_variable
 from django.core.cache import cache
 from django.utils.http import urlquote
 
@@ -25 +24 @@
         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(':'.join([urlquote(resolve_variable(var, context)) for var in self.vary_on]))
+        args = hashlib.md5(':'.join([urlquote(var.resolve(context)) for var in self.vary_on]))
         cache_key = 'template.cache.%s.%s' % (self.fragment_name, args.hexdigest())
         value = cache.get(cache_key)
         if value is None:
@@ -60 +59 @@
     tokens = token.contents.split()
     if len(tokens) < 3:
         raise TemplateSyntaxError("'%r' tag requires at least 2 arguments." % tokens[0])
-    return CacheNode(nodelist, tokens[1], tokens[2], tokens[3:])
+    return CacheNode(nodelist, tokens[1], tokens[2], [parser.compile_filter(token) for token in tokens[3:]])

tests/regressiontests/templates/tests.py

@@ -28 +28 @@
 from django.utils.translation import activate, deactivate, ugettext as _
 from django.utils.safestring import mark_safe
 from django.utils.tzinfo import LocalTimezone
+from django.http import QueryDict
 
 from .callables import CallableVariablesTests
 from .context import ContextTests
@@ -1563 +1564 @@
             # Regression test for #11270.
             'cache17': ('{% load cache %}{% cache 10 long_cache_key poem %}Some Content{% endcache %}', {'poem': 'Oh freddled gruntbuggly/Thy micturations are to me/As plurdled gabbleblotchits/On a lurgid bee/That mordiously hath bitled out/Its earted jurtles/Into a rancid festering/Or else I shall rend thee in the gobberwarts with my blurglecruncheon/See if I dont.'}, 'Some Content'),
 
+            # Regression tests for #18260
+            'cache18': ('{% load cache %}{% cache 2 frag_name request.GET.abc %}cache18{% endcache %}', {'request': RequestContext(RequestFactory().get("/somepath"), dict_={"GET" : QueryDict("abc=xyz")})}, 'cache18'),
+            'cache19': ('{% load cache %}{% cache 2 frag_name request.GET.abc %}cache19{% endcache %}', {'request': RequestContext(RequestFactory().get("/somepath"), dict_={"GET" : QueryDict("foo=bar")})}, 'cache19'),
+            'cache20': ('{% load cache %}{% cache 2 frag_name request.GET.abc|default:"xyz" %}cache20{% endcache %}', {'request': RequestContext(RequestFactory().get("/somepath"), dict_={"GET" : QueryDict("foo=bar")})}, ('cache18', 'cache19')),
+
 
             ### AUTOESCAPE TAG ##############################################
             'autoescape-tag01': ("{% autoescape off %}hello{% endautoescape %}", {}, "hello"),