[Checkins] SVN: zope.app.securitypolicy/trunk/src/zope/app/securitypolicy/browser/ Substitute zope.app.zapi by direct calls to its wrapped apis. See bug 219302

[Lorenzo Gil]

Log message for revision 85741:
  Substitute zope.app.zapi by direct calls to its wrapped apis. See bug 219302

Changed:
  U   zope.app.securitypolicy/trunk/src/zope/app/securitypolicy/browser/granting.py
  U   zope.app.securitypolicy/trunk/src/zope/app/securitypolicy/browser/rolepermissionview.py

-=-
Modified: zope.app.securitypolicy/trunk/src/zope/app/securitypolicy/browser/granting.py
===================================================================
--- zope.app.securitypolicy/trunk/src/zope/app/securitypolicy/browser/granting.py	2008-04-26 06:45:04 UTC (rev 85740)
+++ zope.app.securitypolicy/trunk/src/zope/app/securitypolicy/browser/granting.py	2008-04-26 07:46:02 UTC (rev 85741)
@@ -18,6 +18,7 @@
 __docformat__ = "reStructuredText"
 
 import zope.schema
+from zope.component import getUtilitiesFor
 from zope.schema.vocabulary import SimpleTerm
 from zope.i18nmessageid import ZopeMessageFactory as _
 from zope.securitypolicy.interfaces import Allow, Unset, Deny
@@ -26,7 +27,6 @@
 from zope.securitypolicy.interfaces import IRole
 from zope.securitypolicy.vocabulary import GrantVocabulary
 
-from zope.app import zapi
 from zope.app.security.vocabulary import PrincipalSource
 from zope.app.form.utility import setUpWidget
 from zope.app.form.browser import RadioWidget
@@ -155,14 +155,14 @@
             principal = self.principal_widget.getInputValue()
         except MissingInputError:
             return u''
-        
+
         self.principal = principal
 
         # Make sure we can use the principal id in a form by base64ing it
         principal_token = unicode(principal).encode('base64').strip().replace(
             '=', '_')
 
-        roles = [role for name, role in zapi.getUtilitiesFor(IRole)]
+        roles = [role for name, role in getUtilitiesFor(IRole)]
         roles.sort(lambda x, y: cmp(x.title, y.title))
         principal_roles = IPrincipalRoleManager(self.context)
 
@@ -176,7 +176,7 @@
                         principal_roles.getSetting(role.id, principal))
             self.roles.append(getattr(self, name+'_widget'))
 
-        perms = [perm for name, perm in zapi.getUtilitiesFor(IPermission)]
+        perms = [perm for name, perm in getUtilitiesFor(IPermission)]
         perms.sort(lambda x, y: cmp(x.title, y.title))
         principal_perms = IPrincipalPermissionManager(self.context)
 

Modified: zope.app.securitypolicy/trunk/src/zope/app/securitypolicy/browser/rolepermissionview.py
===================================================================
--- zope.app.securitypolicy/trunk/src/zope/app/securitypolicy/browser/rolepermissionview.py	2008-04-26 06:45:04 UTC (rev 85740)
+++ zope.app.securitypolicy/trunk/src/zope/app/securitypolicy/browser/rolepermissionview.py	2008-04-26 07:46:02 UTC (rev 85741)
@@ -17,12 +17,12 @@
 """
 from datetime import datetime
 
+from zope.component import getUtilitiesFor, getUtility
 from zope.i18n import translate
 from zope.interface import implements
 from zope.exceptions.interfaces import UserError
 from zope.i18nmessageid import ZopeMessageFactory as _
 
-from zope.app import zapi
 from zope.app.security.interfaces import IPermission
 from zope.securitypolicy.interfaces import Unset, Allow, Deny
 from zope.securitypolicy.interfaces import IRole, IRolePermissionManager
@@ -43,7 +43,7 @@
         if roles is None:
             roles = [
                 (translate(role.title, context=self.request).strip(), role)
-                for name, role in zapi.getUtilitiesFor(IRole)]
+                for name, role in getUtilitiesFor(IRole)]
             roles.sort()
             roles = self._roles = [role for name, role in roles]
         return roles
@@ -53,7 +53,7 @@
         if permissions is None:
             permissions = [
                 (translate(perm.title, context=self.request).strip(), perm)
-                for name, perm in zapi.getUtilitiesFor(IPermission)
+                for name, perm in getUtilitiesFor(IPermission)
                 if name != 'zope.Public']
             permissions.sort()
             permissions = self._permissions = [perm
@@ -82,12 +82,12 @@
 
     def permissionForID(self, pid):
         roles = self.roles()
-        perm = zapi.getUtility(IPermission, pid)
+        perm = getUtility(IPermission, pid)
         return PermissionRoles(perm, self.context.__parent__, roles)
 
     def roleForID(self, rid):
         permissions = self.permissions()
-        role = zapi.getUtility(IRole, rid)
+        role = getUtility(IRole, rid)
         return RolePermissions(role, self.context.__parent__, permissions)