Changeset 8533

Timestamp:

08/24/08 23:52:55 (3 months ago)

Author:

mtredinnick

Message:

Fixed #7460 -- Made the "cache" template tag always generate keys that can be
used with the memcache backend (which has the strongest restriction on keys).
Based on a patch from trbs.

Files:

• django/trunk/django/templatetags/cache.py (modified) (2 diffs)
• django/trunk/tests/regressiontests/templates/tests.py (modified) (1 diff)

django/trunk/django/templatetags/cache.py

@@ -3 +3 @@
-from django.core.cache import cache
-from django.utils.encoding import force_unicode
+from django.utils.http import urlquote
-
-register = Library()
@@ -23 +24 @@
-            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.
-force_unicod
+urlquot
-        value = cache.get(cache_key)
-        if value is None:

django/trunk/tests/regressiontests/templates/tests.py

@@ -918 +918 @@
-            'cache15': ('{% load cache %}{% cache foo bar %}{% endcache %}', {'foo': []}, template.TemplateSyntaxError),
-
+            # Regression test for #7460.
+            'cache16': ('{% load cache %}{% cache 1 foo bar %}{% endcache %}', {'foo': 'foo', 'bar': 'with spaces'}, ''),
+
-            ### AUTOESCAPE TAG ##############################################
-            'autoescape-tag01': ("{% autoescape off %}hello{% endautoescape %}", {}, "hello"),