[Checkins] SVN: zope.app.security/trunk/src/zope/app/security/
Substitute zope.app.zapi by direct calls to its wrapped apis.
See bug 219302
Lorenzo Gil
lgs at sicem.biz
Sat Apr 26 02:45:05 EDT 2008
Log message for revision 85740:
Substitute zope.app.zapi by direct calls to its wrapped apis. See bug 219302
Changed:
U zope.app.security/trunk/src/zope/app/security/browser/principalterms.py
U zope.app.security/trunk/src/zope/app/security/browser/principalterms.txt
U zope.app.security/trunk/src/zope/app/security/principalregistry.py
U zope.app.security/trunk/src/zope/app/security/tests/test_securitydirectives.py
-=-
Modified: zope.app.security/trunk/src/zope/app/security/browser/principalterms.py
===================================================================
--- zope.app.security/trunk/src/zope/app/security/browser/principalterms.py 2008-04-26 06:36:01 UTC (rev 85739)
+++ zope.app.security/trunk/src/zope/app/security/browser/principalterms.py 2008-04-26 06:45:04 UTC (rev 85740)
@@ -17,12 +17,12 @@
"""
__docformat__ = "reStructuredText"
+from zope.component import getUtility
from zope.interface import implements
from zope.publisher.interfaces.browser import IBrowserRequest
-from zope.app import zapi
from zope.app.form.browser.interfaces import ITerms
-from zope.app.security.interfaces import IPrincipalSource
+from zope.app.security.interfaces import IAuthentication, IPrincipalSource
class Term(object):
@@ -42,7 +42,7 @@
if principal_id not in self.context:
raise LookupError(principal_id)
- auth = zapi.principals()
+ auth = getUtility(IAuthentication)
principal = auth.getPrincipal(principal_id)
if principal is None:
Modified: zope.app.security/trunk/src/zope/app/security/browser/principalterms.txt
===================================================================
--- zope.app.security/trunk/src/zope/app/security/browser/principalterms.txt 2008-04-26 06:36:01 UTC (rev 85739)
+++ zope.app.security/trunk/src/zope/app/security/browser/principalterms.txt 2008-04-26 06:45:04 UTC (rev 85740)
@@ -31,10 +31,10 @@
We need a principal source so that we can create a view from it.
- >>> from zope.app import zapi
+ >>> from zope.component import getUtility
>>> class PrincipalSource:
... def __contains__(self, id):
- ... auth = zapi.getUtility(IAuthentication)
+ ... auth = getUtility(IAuthentication)
... try:
... auth.getPrincipal(id)
... except PrincipalLookupError:
Modified: zope.app.security/trunk/src/zope/app/security/principalregistry.py
===================================================================
--- zope.app.security/trunk/src/zope/app/security/principalregistry.py 2008-04-26 06:36:01 UTC (rev 85739)
+++ zope.app.security/trunk/src/zope/app/security/principalregistry.py 2008-04-26 06:45:04 UTC (rev 85740)
@@ -15,11 +15,11 @@
$Id$
"""
+from zope.component import getUtility
from zope.interface import implements
from zope.app.authentication.interfaces import IPasswordManager
from zope.app.security.interfaces import PrincipalLookupError
-from zope.app import zapi
from zope.security.interfaces import IGroupAwarePrincipal
import zope.security.management
from zope.app.security import interfaces
@@ -164,7 +164,7 @@
self.__pw = pw
def __getPasswordManager(self):
- return zapi.getUtility(IPasswordManager, self.__pwManagerName)
+ return getUtility(IPasswordManager, self.__pwManagerName)
def getLogin(self):
return self.__login
Modified: zope.app.security/trunk/src/zope/app/security/tests/test_securitydirectives.py
===================================================================
--- zope.app.security/trunk/src/zope/app/security/tests/test_securitydirectives.py 2008-04-26 06:36:01 UTC (rev 85739)
+++ zope.app.security/trunk/src/zope/app/security/tests/test_securitydirectives.py 2008-04-26 06:45:04 UTC (rev 85740)
@@ -19,7 +19,7 @@
from zope.configuration.config import ConfigurationConflictError
from zope.configuration import xmlconfig
-from zope.app import zapi
+from zope.component import getUtility
from zope.app.testing import ztapi
from zope.app.testing.placelesssetup import PlacelessSetup
@@ -58,7 +58,7 @@
def testRegister(self):
context = xmlconfig.file("perm.zcml", zope.app.security.tests)
- perm = zapi.getUtility(IPermission, "Can.Do.It")
+ perm = getUtility(IPermission, "Can.Do.It")
self.failUnless(perm.id.endswith('Can.Do.It'))
self.assertEqual(perm.title, 'A Permissive Permission')
self.assertEqual(perm.description,
More information about the Checkins
mailing list