[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/OFS/Container/Find - FindAdapter.py:1.1.2.4

Jim Fulton jim@zope.com
Mon, 10 Jun 2002 15:34:47 -0400


Update of /cvs-repository/Zope3/lib/python/Zope/App/OFS/Container/Find
In directory cvs.zope.org:/tmp/cvs-serv5490/lib/python/Zope/App/OFS/Container/Find

Modified Files:
      Tag: Zope-3x-branch
	FindAdapter.py 
Log Message:
Implemented 

http://dev.zope.org/Wikis/DevSite/Projects/ComponentArchitecture/IContainerPythonification

Along the way:

- Converted most uses of has_key to use in.

- Fixed a bug in Interface names and namesAndDescriptions methods 
  that caused base class attributes to be missed.



=== Zope3/lib/python/Zope/App/OFS/Container/Find/FindAdapter.py 1.1.2.3 => 1.1.2.4 ===
         result = []
         container = self._context
-        for id, object in container.objectItems():
+        for id, object in container.items():
             object = ContextWrapper(object, container, name=id)
             _find_helper(id, object, container,
                          id_filters, object_filters,
@@ -69,7 +69,7 @@
         return
 
     container = object
-    for id, object in container.objectItems():
+    for id, object in container.items():
         object = ContextWrapper(object, container, name=id)
         _find_helper(id, object, container, id_filters, object_filters, result)