Changeset 2996 in products for quintagroup.plonegooglesitemaps/branches/blacklist/quintagroup/plonegooglesitemaps/filters.py

Timestamp:

Nov 11, 2010 10:29:06 AM (13 years ago)

Author:

mylan

Message:

#228: remake filters to generators

File:

• quintagroup.plonegooglesitemaps/branches/blacklist/quintagroup/plonegooglesitemaps/filters.py (modified) (4 diffs)

quintagroup.plonegooglesitemaps/branches/blacklist/quintagroup/plonegooglesitemaps/filters.py

@@ +1 @@
+from itertools import ifilter
 from zope.interface import implements
 from zope.component import queryMultiAdapter
 from quintagroup.plonegooglesitemaps.interfaces import IBlackoutFilter
+
 
 class IdBlackoutFilter(object):
@@ -14 +16 @@
     def filterOut(self, fdata, fargs):
         """Filter-out fdata list by id in fargs."""
-        for b in fdata:
-            if (b.getId or b.id) != fargs:
-                yield b
+        return ifilter(lambda b,fa=fargs:(b.getId or b.id) != fargs,
+                       fdata)
 
 
@@ -30 +31 @@
     def filterOut(self, fdata, fargs):
         """Filter-out fdata list by path in fargs."""
-        if not (fargs.startswith("/") or fargs.startswith("./")):
-            for b in fdata:
-                yield b
-            
         if fargs.startswith("/"):
             # absolute path filter
@@ -39 +36 @@
                          name=u"plone_portal_state").portal().getId()
             test_path = '/' + portal_id + fargs
-        else:
+        elif fargs.startswith("./"):
             # relative path filter
             container_path = '/'.join(self.context.getPhysicalPath()[:-1])
             test_path = container_path + fargs[1:]
+        else:
+            # unrecognized starting point
+            return fdata
 
-        for b in fdata:
-            if b.getPath() != test_path:
-                yield b 
-
+        return ifilter(lambda b,tp=test_path: b.getPath() != tp,
+                       fdata)