merge from HEAD

Author: Richard Jones

CHANGES.txt

@@ -1,6 +1,11 @@
 This file contains the changes to the Roundup system over time. The entries
 are given with the most recent entry first.
 
+2005-??-?? 0.8.1
+Fixed:
+- replaced MutlilinkIterator with multilinkGenerator (thanks Bob Ippolito)
+
+
 2005-02-16 0.8.0
 Fixed:
 - fix roundup-server log and PID file paths to be absolute

roundup/cgi/templating.py

@@ -1687,25 +1687,18 @@ def menu(self, size=None, height=None, showid=0, additional=[],
         return '\n'.join(l)
 #    def checklist(self, ...)
 
-class MultilinkIterator:
-    def __init__(self, classname, client, values):
-        self.classname = classname
-        self.client = client
-        self.values = values
-        self.id = -1
-    def next(self):
-        '''Return the next item, but skip inaccessible items.'''
-        check = self.client.db.security.hasPermission
-        userid = self.client.userid
-        while 1:
-            self.id += 1
-            if self.id >= len(self.values):
-                raise StopIteration
-            value = self.values[self.id]
-            if check('View', userid, self.classname, itemid=value):
-                return HTMLItem(self.client, self.classname, value)
-    def __iter__(self):
-        return self
+
+def multilinkGenerator(classname, client, values):
+    id = -1
+    check = client.db.security.hasPermission
+    userid = client.userid
+    while 1:
+        id += 1
+        if id >= len(values):
+            raise StopIteration
+        value = values[id]
+        if check('View', userid, classname, itemid=value):
+            yield HTMLItem(client, classname, value)
 
 
 class MultilinkHTMLProperty(HTMLProperty):
@@ -1733,15 +1726,15 @@ def __getattr__(self, attr):
     def __iter__(self):
         ''' iterate and return a new HTMLItem
         '''
-        return MultilinkIterator(self._prop.classname, self._client,
+        return multilinkGenerator(self._prop.classname, self._client,
             self._value)
 
     def reverse(self):
         ''' return the list in reverse order
         '''
         l = self._value[:]
         l.reverse()
-        return MultilinkIterator(self._prop.classname, self._client, l)
+        return multilinkGenerator(self._prop.classname, self._client, l)
 
     def sorted(self, property):
         ''' Return this multilink sorted by the given property '''