[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/OFS/ServiceManager/tests - testServiceManager.py:1.1.2.7

[Jim Fulton]

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

Modified Files:
      Tag: Zope-3x-branch
	testServiceManager.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/ServiceManager/tests/testServiceManager.py 1.1.2.6 => 1.1.2.7 ===
 from Zope.App.OFS.Folder.RootFolder import RootFolder
 from Zope.App.OFS.Folder.Folder import Folder
-from Zope.ContextWrapper import Wrapper
+from Zope.Proxy.ContextWrapper import ContextWrapper
 from Zope.App.OFS.ServiceManager.ServiceManager import ServiceManager
 from Zope.Testing.CleanUp import CleanUp # Base class w registry cleanup
 from Zope.ComponentArchitecture import provideService, getService