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

[Jim Fulton]

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

Modified Files:
      Tag: SecurityProxy-branch
	testServiceManager.py 
Log Message:
Changed security code to use security proxies and name-based
security. This has pretty far-reaching implications:

- You now protect names/operations, *not* values. This means it's as
  easy yo protect data attributes that have simple values as it is to
  protect methods.

- There is no longer a __permissions__ attribute. :)

- There is no longer a validate method in either security managers or
  policies. 

- No more need to have a special compiler for restricted code.
  In exchange, lots of objects are proxies and code sometimes needs to
  be prepared to remove proxies.

In addition:

- Basic objects (None, strings, numbers, etc.) are not wrapped in
  context wrappers.

- There is a test that fails unless Python 2.3 is used.



=== Zope3/lib/python/Zope/App/OFS/ServiceManager/tests/testServiceManager.py 1.1.2.5 => 1.1.2.5.2.1 ===
 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
@@ -53,7 +53,7 @@
         folder = Folder()
         root.setObject('folder', folder)
         self.folder = folder
-        w = Wrapper(root, root.getObject('folder'))
+        w = ContextWrapper(root, root.getObject('folder'))
         self.wrapped_folder = w
 
     def testAddService(self):