Author: gwilson
Date: 2007-11-02 21:04:59 -0500 (Fri, 02 Nov 2007)
New Revision: 6636
Modified:
django/trunk/django/template/defaulttags.py
Log:
Made use of `itertools.cycle` for the `cycle` template tag.
Modified: django/trunk/django/template/defaulttags.py
===================================================================
--- django/trunk/django/template/defaulttags.py 2007-10-31 04:04:07 UTC (rev
6635)
+++ django/trunk/django/template/defaulttags.py 2007-11-03 02:04:59 UTC (rev
6636)
@@ -1,5 +1,7 @@
"Default tags used by the template system, available to all templates."
+from itertools import cycle as itertools_cycle
+
from django.template import Node, NodeList, Template, Context, Variable
from django.template import TemplateSyntaxError, VariableDoesNotExist,
BLOCK_TAG_START, BLOCK_TAG_END, VARIABLE_TAG_START, VARIABLE_TAG_END,
SINGLE_BRACE_START, SINGLE_BRACE_END, COMMENT_TAG_START, COMMENT_TAG_END
from django.template import get_library, Library, InvalidTemplateLibrary
@@ -22,14 +24,11 @@
class CycleNode(Node):
def __init__(self, cyclevars, variable_name=None):
- self.cyclevars = cyclevars
- self.cyclevars_len = len(cyclevars)
- self.counter = -1
+ self.cycle_iter = itertools_cycle(cyclevars)
self.variable_name = variable_name
def render(self, context):
- self.counter += 1
- value = self.cyclevars[self.counter % self.cyclevars_len]
+ value = self.cycle_iter.next()
value = Variable(value).resolve(context)
if self.variable_name:
context[self.variable_name] = value
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---