Ticket #7501: fixcyclebehaviour.patch

tests/regressiontests/templates/tests.py

@@ -156 +156 @@
         split = token.split_contents()
         self.assertEqual(split, ["sometag", '_("Page not found")', 'value|yesno:_("yes,no")'])
 
+    def test_cycle_multiple_render(self):
+        t = template.Template("{% cycle a,b,c as abc %}{% cycle abc %}")
+        c = template.Context({})
+        print "K", t.render(c), t.render(c)
+        self.assertEqual(t.render(c),  t.render(c))
+
+        t = template.Template("{% for letter in abc %}{% cycle 'd' 'e' 'f' 'g'  %}{% endfor %}")
+        c = template.Context({"abc": ("a", "b", "c")})
+
+        print "S", t.render(c), t.render(c)
+        self.assertEqual(t.render(c),  t.render(c))
+
     def test_url_reverse_no_settings_module(self):
         # Regression test for #9005
         from django.template import Template, Context, TemplateSyntaxError

django/template/defaulttags.py

@@ -39 +39 @@
 
 class CycleNode(Node):
     def __init__(self, cyclevars, variable_name=None):
-        self.cycle_iter = itertools_cycle(cyclevars)
+        self.cycle_vars = cyclevars
         self.variable_name = variable_name
+        self._first = False
 
     def render(self, context):
+        if self._first:
+            self.cycle_iter = itertools_cycle(self.cycle_vars)
         value = self.cycle_iter.next().resolve(context)
         if self.variable_name:
             context[self.variable_name] = value
+        self._first = False
         return value
 
+    def reset(self):
+        self._first = True
+
 class DebugNode(Node):
     def render(self, context):
         from pprint import pformat

django/template/__init__.py

@@ -175 +175 @@
 
     def render(self, context):
         "Display stage -- can be called many times"
+        for n in self.nodelist.get_nodes_by_type(Node):
+            try:
+                n.reset()
+            except:
+                pass
         return self.nodelist.render(context)
 
 def compile_string(template_string, origin):