[Zope3-checkins] CVS: Zope3/src/zope/app/security/tests - test_securitydirectives.py:1.12.4.4

[Steve Alexander]

Update of /cvs-repository/Zope3/src/zope/app/security/tests
In directory cvs.zope.org:/tmp/cvs-serv5383/src/zope/app/security/tests

Modified Files:
      Tag: steveachrismcd-securitypolicy-branch
	test_securitydirectives.py 
Log Message:
Remove things to do with Roles that weren't used anyway.


=== Zope3/src/zope/app/security/tests/test_securitydirectives.py 1.12.4.3 => 1.12.4.4 ===
--- Zope3/src/zope/app/security/tests/test_securitydirectives.py:1.12.4.3	Wed Jan 14 01:06:48 2004
+++ Zope3/src/zope/app/security/tests/test_securitydirectives.py	Wed Jan 14 14:42:51 2004
@@ -18,9 +18,8 @@
 import unittest
 
 from zope.component.service import serviceManager as services
-from zope.app.services.servicenames import Roles, Permissions, Authentication
+from zope.app.services.servicenames import Permissions, Authentication
 from zope.app.interfaces.security import IPermissionService
-from zope.products.securitypolicy.interfaces import IRoleService
 from zope.app.interfaces.security import IAuthenticationService
 
 from zope.configuration.config import ConfigurationConflictError
@@ -32,26 +31,18 @@
 from zope.app.security.settings import Allow
 from zope.app.security.registries.principalregistry import principalRegistry
 from zope.app.security.registries.permissionregistry \
-        import permissionRegistry as pregistry
-from zope.products.securitypolicy.roleregistry import roleRegistry as rregistry
-from zope.products.securitypolicy.rolepermission \
-        import rolePermissionManager as role_perm_mgr
+    import permissionRegistry as pregistry
 from zope.products.securitypolicy.principalpermission \
     import principalPermissionManager as principal_perm_mgr
-from zope.products.securitypolicy.principalrole \
-    import principalRoleManager as principal_role_mgr
 
 class TestBase(CleanUp):
 
     def setUp(self):
         CleanUp.setUp(self)
-    
+
         services.defineService(Permissions, IPermissionService)
         services.provideService(Permissions, pregistry)
-    
-        services.defineService(Roles, IRoleService)
-        services.provideService(Roles, rregistry)
-    
+
         services.defineService(Authentication, IAuthenticationService)
         services.provideService(Authentication, principalRegistry)