[Zope-Checkins] CVS: Zope/lib/python/ZTUtils - Tree.py:1.6.6.6 Zope.py:1.10.6.1

[Martijn Pieters]

Update of /cvs-repository/Zope/lib/python/ZTUtils
In directory cvs.zope.org:/tmp/cvs-serv1643/lib/python/ZTUtils

Modified Files:
      Tag: Zope-2_6-branch
	Tree.py Zope.py 
Log Message:
Merge skipping of unauthorized tree objects during child object filtering
from the trunk.


=== Zope/lib/python/ZTUtils/Tree.py 1.6.6.5 => 1.6.6.6 ===
--- Zope/lib/python/ZTUtils/Tree.py:1.6.6.5	Fri Oct  4 22:10:58 2002
+++ Zope/lib/python/ZTUtils/Tree.py	Mon Oct  7 15:45:10 2002
@@ -139,6 +139,9 @@
             # Assume callable; result not useful anyway otherwise.
             children = children()
 
+        return self.filterChildren(children)
+
+    def filterChildren(self, children):
         if self._values_filter:
             return self._values_filter(children)
         return children


=== Zope/lib/python/ZTUtils/Zope.py 1.10 => 1.10.6.1 ===
--- Zope/lib/python/ZTUtils/Zope.py:1.10	Wed Aug 14 18:10:12 2002
+++ Zope/lib/python/ZTUtils/Zope.py	Mon Oct  7 15:45:10 2002
@@ -99,6 +99,9 @@
         return self
     def getChildren(self, object):
         return LazyFilter(self._getChildren(object), skip=self.skip)
+    def filterChildren(self, children):
+        if self._values_filter:
+            return self._values_filter(LazyFilter(children, skip=self.skip))
 
 class TreeMaker(TreeSkipMixin, TreeMaker):
     _getChildren = TreeMaker.getChildren