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

[Jim Fulton]

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

Modified Files:
      Tag: Zope-3x-branch
	FindAdapter.py 
Log Message:
HOTYB: Merged SecurityProxy-branch into main branch.  

All tests pass and folders can be listed and added through the web.
It is likely that most other things don't work and will need to be
fixed. The reason is that many accesses that should have been checked
before are now being checked and additional checks and thinking about
permissions and security settings are needed.

I'm in the process of drafting a paper for the wiki that describes the
changes in more detail.


=== Zope3/lib/python/Zope/App/OFS/Container/Find/FindAdapter.py 1.1.2.2 => 1.1.2.3 ===
 from Zope.App.OFS.Container.IContainer import IReadContainer
 # XXX need to do this manually to wrap objects
-from Zope.ContextWrapper import Wrapper
+from Zope.Proxy.ContextWrapper import ContextWrapper
 
 class FindAdapter(object):
 
@@ -42,7 +42,7 @@
         result = []
         container = self._context
         for id, object in container.objectItems():
-            object = Wrapper(object, container, name=id)
+            object = ContextWrapper(object, container, name=id)
             _find_helper(id, object, container,
                          id_filters, object_filters,
                          result)
@@ -70,7 +70,7 @@
 
     container = object
     for id, object in container.objectItems():
-        object = Wrapper(object, container, name=id)
+        object = ContextWrapper(object, container, name=id)
         _find_helper(id, object, container, id_filters, object_filters, result)
 
 class SimpleIdFindFilter(object):