merge from HEAD

Author: Richard Jones

CHANGES.txt

@@ -7,6 +7,7 @@ Fixed:
 - replaced MutlilinkIterator with multilinkGenerator (thanks Bob Ippolito)
 - fixed broken csv import in roundup.admin module
 - fixed braino in HTMLClass.filter() (sf bug 1124213)
+- change ZTUtils Iterator to always iter() its sequence argument
 
 
 2005-02-16 0.8.0

roundup/cgi/ZTUtils/Iterator.py

@@ -18,9 +18,9 @@
 iterator.  The next() method fetches the next item, and returns
 true if it succeeds.
 
-$Id: Iterator.py,v 1.3 2004-02-11 23:55:09 richard Exp $'''
+$Id: Iterator.py,v 1.3.4.1 2005-02-16 22:10:24 richard Exp $'''
 __docformat__ = 'restructuredtext'
-__version__='$Revision: 1.3 $'[11:-2]
+__version__='$Revision: 1.3.4.1 $'[11:-2]
 
 import string
 
@@ -31,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:

roundup/cgi/templating.py

@@ -1711,7 +1711,7 @@ def __getattr__(self, attr):
         ''' no extended attribute accesses make sense here '''
         raise AttributeError, attr
 
-    def multilinkGenerator(self, values):
+    def viewableGenerator(self, values):
         '''Used to iterate over only the View'able items in a class.'''
         check = self._db.security.hasPermission
         userid = self._client.userid
@@ -1723,14 +1723,14 @@ def multilinkGenerator(self, values):
     def __iter__(self):
         ''' iterate and return a new HTMLItem
         '''
-        return self.multilinkGenerator(self._value)
+        return self.viewableGenerator(self._value)
 
     def reverse(self):
         ''' return the list in reverse order
         '''
         l = self._value[:]
         l.reverse()
-        return self.multilinkGenerator(l)
+        return self.viewableGenerator(l)
 
     def sorted(self, property):
         ''' Return this multilink sorted by the given property '''