[Zope3-checkins] CVS: Zope3/src/zope/app/security/grants/tests - test_annotationprincipalpermissionmanager.py:1.3.4.1 test_annotationprincipalrolemanager.py:1.3.4.1 test_annotationrolepermissionmanager.py:1.3.4.1 test_principalpermissionmanager.py:1.3.4.1 test_principalrolemanager.py:1.3.4.1 test_rolepermissionmanager.py:1.3.4.1

Sidnei da Silva sidnei@x3ng.com.br
Tue, 11 Feb 2003 09:41:59 -0500


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

Modified Files:
      Tag: paris-copypasterename-branch
	test_annotationprincipalpermissionmanager.py 
	test_annotationprincipalrolemanager.py 
	test_annotationrolepermissionmanager.py 
	test_principalpermissionmanager.py 
	test_principalrolemanager.py test_rolepermissionmanager.py 
Log Message:
Updating from HEAD to make sure everything still works before merging

=== Zope3/src/zope/app/security/grants/tests/test_annotationprincipalpermissionmanager.py 1.3 => 1.3.4.1 ===
--- Zope3/src/zope/app/security/grants/tests/test_annotationprincipalpermissionmanager.py:1.3	Thu Dec 26 13:49:08 2002
+++ Zope3/src/zope/app/security/grants/tests/test_annotationprincipalpermissionmanager.py	Tue Feb 11 09:41:28 2003
@@ -18,6 +18,7 @@
 
 from zope.app.interfaces.annotation import IAttributeAnnotatable
 from zope.component import getService
+from zope.component.servicenames import Adapters
 from zope.app.interfaces.annotation import IAnnotations
 from zope.app.attributeannotations import AttributeAnnotations
 from zope.app.security.registries.permissionregistry \
@@ -36,7 +37,7 @@
 
     def setUp(self):
         PlacelessSetup.setUp(self)
-        getService(None,"Adapters").provideAdapter(
+        getService(None,Adapters).provideAdapter(
             IAttributeAnnotatable, IAnnotations,
             AttributeAnnotations)
 


=== Zope3/src/zope/app/security/grants/tests/test_annotationprincipalrolemanager.py 1.3 => 1.3.4.1 ===
--- Zope3/src/zope/app/security/grants/tests/test_annotationprincipalrolemanager.py:1.3	Thu Dec 26 13:49:08 2002
+++ Zope3/src/zope/app/security/grants/tests/test_annotationprincipalrolemanager.py	Tue Feb 11 09:41:28 2003
@@ -18,6 +18,7 @@
 
 from zope.app.interfaces.annotation import IAttributeAnnotatable
 from zope.component import getService
+from zope.component.servicenames import Adapters
 from zope.app.interfaces.annotation import IAnnotations
 from zope.app.attributeannotations import AttributeAnnotations
 from zope.app.security.registries.roleregistry import roleRegistry as rregistry
@@ -36,7 +37,7 @@
 
     def setUp(self):
         PlacefulSetup.setUp(self)
-        getService(None, "Adapters").provideAdapter(
+        getService(None, Adapters).provideAdapter(
             IAttributeAnnotatable, IAnnotations,
             AttributeAnnotations)
 


=== Zope3/src/zope/app/security/grants/tests/test_annotationrolepermissionmanager.py 1.3 => 1.3.4.1 ===
--- Zope3/src/zope/app/security/grants/tests/test_annotationrolepermissionmanager.py:1.3	Thu Dec 26 13:49:08 2002
+++ Zope3/src/zope/app/security/grants/tests/test_annotationrolepermissionmanager.py	Tue Feb 11 09:41:28 2003
@@ -18,6 +18,7 @@
 from zope.app.attributeannotations import AttributeAnnotations
 from zope.component \
      import getServiceManager, getService
+from zope.component.servicenames import Permissions, Adapters
 from zope.app.interfaces.security import IRoleService
 from zope.app.interfaces.security import IPermissionService
 from zope.app.security.registries.roleregistry import roleRegistry
@@ -38,10 +39,10 @@
         defineService=getServiceManager(None).defineService
         provideService=getServiceManager(None).provideService
         defineService('Roles', IRoleService)
-        defineService('Permissions', IPermissionService)
+        defineService(Permissions, IPermissionService)
         provideService('Roles', roleRegistry)
-        provideService('Permissions', permissionRegistry)
-        provideAdapter=getService(None,"Adapters").provideAdapter
+        provideService(Permissions, permissionRegistry)
+        provideAdapter=getService(None,Adapters).provideAdapter
         provideAdapter(IAttributeAnnotatable, IAnnotations,
                        AttributeAnnotations)
 


=== Zope3/src/zope/app/security/grants/tests/test_principalpermissionmanager.py 1.3 => 1.3.4.1 ===
--- Zope3/src/zope/app/security/grants/tests/test_principalpermissionmanager.py:1.3	Thu Dec 26 13:49:08 2002
+++ Zope3/src/zope/app/security/grants/tests/test_principalpermissionmanager.py	Tue Feb 11 09:41:28 2003
@@ -17,6 +17,7 @@
 import unittest
 
 from zope.component.service import serviceManager as services
+from zope.component.servicenames import Permissions, Authentication
 
 from zope.app.interfaces.security import IPermissionService
 from zope.app.interfaces.security import IAuthenticationService
@@ -35,11 +36,11 @@
     def setUp(self):
         CleanUp.setUp(self)
 
-        services.defineService('Permissions', IPermissionService)
-        services.provideService('Permissions', permregistry)
+        services.defineService(Permissions, IPermissionService)
+        services.provideService(Permissions, permregistry)
 
-        services.defineService('Authentication', IAuthenticationService)
-        services.provideService('Authentication', prinregistry)
+        services.defineService(Authentication, IAuthenticationService)
+        services.provideService(Authentication, prinregistry)
 
 
     def _make_principal(self, id=None, title=None):


=== Zope3/src/zope/app/security/grants/tests/test_principalrolemanager.py 1.3 => 1.3.4.1 ===
--- Zope3/src/zope/app/security/grants/tests/test_principalrolemanager.py:1.3	Thu Dec 26 13:49:08 2002
+++ Zope3/src/zope/app/security/grants/tests/test_principalrolemanager.py	Tue Feb 11 09:41:28 2003
@@ -17,6 +17,7 @@
 import unittest
 
 from zope.component.service import serviceManager as services
+from zope.component.servicenames import Authentication
 
 from zope.app.interfaces.security import IRoleService
 from zope.app.interfaces.security import IAuthenticationService
@@ -37,8 +38,8 @@
         services.defineService('Roles', IRoleService)
         services.provideService('Roles', rregistry)
 
-        services.defineService('Authentication', IAuthenticationService)
-        services.provideService('Authentication', pregistry)
+        services.defineService(Authentication, IAuthenticationService)
+        services.provideService(Authentication, pregistry)
 
     def _make_principal(self, id=None, title=None):
         p = pregistry.definePrincipal(


=== Zope3/src/zope/app/security/grants/tests/test_rolepermissionmanager.py 1.3 => 1.3.4.1 ===
--- Zope3/src/zope/app/security/grants/tests/test_rolepermissionmanager.py:1.3	Thu Dec 26 13:49:08 2002
+++ Zope3/src/zope/app/security/grants/tests/test_rolepermissionmanager.py	Tue Feb 11 09:41:28 2003
@@ -17,6 +17,7 @@
 import unittest
 
 from zope.component.service import serviceManager as services
+from zope.component.servicenames import Permissions, Roles
 
 from zope.app.interfaces.security import IPermissionService
 from zope.app.interfaces.security import IRoleService
@@ -36,11 +37,11 @@
     def setUp(self):
         CleanUp.setUp(self)
 
-        services.defineService('Permissions', IPermissionService)
-        services.provideService('Permissions', pregistry)
+        services.defineService(Permissions, IPermissionService)
+        services.provideService(Permissions, pregistry)
 
-        services.defineService('Roles', IRoleService)
-        services.provideService('Roles', rregistry)
+        services.defineService(Roles, IRoleService)
+        services.provideService(Roles, rregistry)
 
     def testUnboundRolePermission(self):
         permission = pregistry.definePermission('APerm', 'aPerm title').getId()