[Zope-Checkins] CVS: Zope/lib/python/ZTUtils - Tree.py:1.15.2.2 Zope.py:1.11.42.1

Chris McDonough chrism@zope.com
Mon, 21 Jul 2003 12:39:18 -0400


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

Modified Files:
      Tag: Zope-2_7-branch
	Tree.py Zope.py 
Log Message:
Merge changes from HEAD since the release of Zope 2.7a1 into the Zope-2_7-branch in preparation for release of Zope 2.7b1.


=== Zope/lib/python/ZTUtils/Tree.py 1.15.2.1 => 1.15.2.2 ===


=== Zope/lib/python/ZTUtils/Zope.py 1.11 => 1.11.42.1 ===
--- Zope/lib/python/ZTUtils/Zope.py:1.11	Mon Oct  7 15:43:15 2002
+++ Zope/lib/python/ZTUtils/Zope.py	Mon Jul 21 12:37:40 2003
@@ -102,6 +102,7 @@
     def filterChildren(self, children):
         if self._values_filter:
             return self._values_filter(LazyFilter(children, skip=self.skip))
+        return children
 
 class TreeMaker(TreeSkipMixin, TreeMaker):
     _getChildren = TreeMaker.getChildren