[Zope3-checkins] CVS: Zope3/src/zope/app/securitypolicy - permissionroles.py:1.3 principalpermission.py:1.2 principalrole.py:1.2 rolepermission.py:1.3

[Jim Fulton]

Update of /cvs-repository/Zope3/src/zope/app/securitypolicy
In directory cvs.zope.org:/tmp/cvs-serv11249/src/zope/app/securitypolicy

Modified Files:
	permissionroles.py principalpermission.py principalrole.py 
	rolepermission.py 
Log Message:
Converted most getAdapter calls to use interface calls instead.


=== Zope3/src/zope/app/securitypolicy/permissionroles.py 1.2 => 1.3 ===
--- Zope3/src/zope/app/securitypolicy/permissionroles.py:1.2	Fri Mar  5 13:39:07 2004
+++ Zope3/src/zope/app/securitypolicy/permissionroles.py	Sat Mar  6 11:50:29 2004
@@ -15,7 +15,6 @@
 $Id$
 """
 
-from zope.component import getAdapter
 from zope.interface import implements
 
 from zope.app.interfaces.security import IPermission
@@ -44,7 +43,7 @@
         """
         Returns the list of setting names of each role for this permission.
         """
-        prm = getAdapter(self._context, IRolePermissionManager)
+        prm = IRolePermissionManager(self._context)
         proles = prm.getRolesForPermission(self._permission.getId())
         settings = {}
         for role, setting in proles:


=== Zope3/src/zope/app/securitypolicy/principalpermission.py 1.1 => 1.2 ===
--- Zope3/src/zope/app/securitypolicy/principalpermission.py:1.1	Fri Feb 27 07:46:31 2004
+++ Zope3/src/zope/app/securitypolicy/principalpermission.py	Sat Mar  6 11:50:29 2004
@@ -16,8 +16,6 @@
 $Id$
 """
 
-from zope.component import getAdapter
-
 from zope.interface import implements
 from zope.app.interfaces.annotation import IAnnotations
 from zope.app.securitypolicy.interfaces import IPrincipalPermissionManager
@@ -96,7 +94,7 @@
         # getting PrincipalPermissions.
         from zope.proxy import removeAllProxies
         context = removeAllProxies(self._context)
-        annotations = getAdapter(context, IAnnotations)
+        annotations = IAnnotations(context)
         try:
             return annotations[annotation_key]
         except KeyError:


=== Zope3/src/zope/app/securitypolicy/principalrole.py 1.1 => 1.2 ===
--- Zope3/src/zope/app/securitypolicy/principalrole.py:1.1	Fri Feb 27 07:46:31 2004
+++ Zope3/src/zope/app/securitypolicy/principalrole.py	Sat Mar  6 11:50:29 2004
@@ -15,7 +15,6 @@
 
 __metaclass__ = type
 
-from zope.component import getAdapter
 from zope.interface import implements
 from zope.security.proxy import trustedRemoveSecurityProxy
 
@@ -90,7 +89,7 @@
     def _getPrincipalRoles(self, create=0):
         """ Get the principal role map stored in the context, optionally
             creating one if necessary """
-        annotations = getAdapter(self._context, IAnnotations)
+        annotations = IAnnotations(self._context)
         try:
             # there's a chance that annotations is security proxied -
             # remove proxy to avoid authentication failure on role lookup


=== Zope3/src/zope/app/securitypolicy/rolepermission.py 1.2 => 1.3 ===
--- Zope3/src/zope/app/securitypolicy/rolepermission.py:1.2	Fri Mar  5 13:39:07 2004
+++ Zope3/src/zope/app/securitypolicy/rolepermission.py	Sat Mar  6 11:50:29 2004
@@ -109,7 +109,7 @@
         # getting RolePermissions.
         from zope.proxy import removeAllProxies
         context = removeAllProxies(self._context)
-        annotations = zapi.getAdapter(context, IAnnotations)
+        annotations = IAnnotations(context)
         try:
             return annotations[annotation_key]
         except KeyError:
@@ -137,7 +137,7 @@
         return self._role.description
 
     def permissionsInfo(self):
-        prm = zapi.getAdapter(self._context, IRolePermissionManager)
+        prm = IRolePermissionManager(self._context)
         rperms = prm.getPermissionsForRole(self._role.id)
         settings = {}
         for permission, setting in rperms: