X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=roundup%2Fcgi%2FZTUtils%2FIterator.py;h=d7f9fff763ee99f35af161c38b3c4956785a7770;hb=0e52c41f35764f37f1e00d30203d3e6e6122a0da;hp=b6c7a6fe441050b227e7dc1152ea5c9067830e80;hpb=a30b78526532bb0bf883224d43b1b51c24d6b831;p=roundup.git diff --git a/roundup/cgi/ZTUtils/Iterator.py b/roundup/cgi/ZTUtils/Iterator.py index b6c7a6f..d7f9fff 100644 --- a/roundup/cgi/ZTUtils/Iterator.py +++ b/roundup/cgi/ZTUtils/Iterator.py @@ -18,8 +18,9 @@ The Iterator() function accepts either a sequence or a Python iterator. The next() method fetches the next item, and returns true if it succeeds. -$Id: Iterator.py,v 1.2 2002-09-26 21:54:17 richard Exp $''' -__version__='$Revision: 1.2 $'[11:-2] +$Id: Iterator.py,v 1.4 2005-02-16 22:07:33 richard Exp $''' +__docformat__ = 'restructuredtext' +__version__='$Revision: 1.4 $'[11:-2] import string @@ -30,13 +31,9 @@ class Iterator: nextIndex = 0 def __init__(self, seq): - self.seq = seq - for inner in seqInner, iterInner: - if inner._supports(seq): - self._inner = inner - self._prep_next = inner.prep_next - return - raise TypeError, "Iterator does not support %s" % `seq` + self.seq = iter(seq) # force seq to be an iterator + self._inner = iterInner + self._prep_next = iterInner.prep_next def __getattr__(self, name): try: