[Checkins] SVN: zope.app.component/trunk/src/zope/app/component/
Substitute zope.app.zapi by direct calls to its wrapped apis.
See bug 219302
Lorenzo Gil
lgs at sicem.biz
Mon Apr 28 15:31:59 EDT 2008
Log message for revision 85829:
Substitute zope.app.zapi by direct calls to its wrapped apis. See bug 219302
Changed:
U zope.app.component/trunk/src/zope/app/component/README.txt
U zope.app.component/trunk/src/zope/app/component/back35.py
U zope.app.component/trunk/src/zope/app/component/site.txt
U zope.app.component/trunk/src/zope/app/component/testing.py
U zope.app.component/trunk/src/zope/app/component/tests/test_contentdirective.py
U zope.app.component/trunk/src/zope/app/component/tests/test_directives.py
-=-
Modified: zope.app.component/trunk/src/zope/app/component/README.txt
===================================================================
--- zope.app.component/trunk/src/zope/app/component/README.txt 2008-04-28 18:16:20 UTC (rev 85828)
+++ zope.app.component/trunk/src/zope/app/component/README.txt 2008-04-28 19:31:09 UTC (rev 85829)
@@ -52,8 +52,8 @@
If we ask `folder1` for its nearest site manager, we get
- >>> from zope.app import zapi
- >>> zapi.getSiteManager(root['folder1']) is folder1_sm
+ >>> from zope.component import getSiteManager
+ >>> getSiteManager(root['folder1']) is folder1_sm
True
but its next site manager is
@@ -64,7 +64,8 @@
The next site manager of the local root is the global site manager:
- >>> gsm = zapi.getGlobalSiteManager()
+ >>> from zope.component import getGlobalSiteManager
+ >>> gsm = getGlobalSiteManager()
>>> component.getNextSiteManager(root) is gsm
True
Modified: zope.app.component/trunk/src/zope/app/component/back35.py
===================================================================
--- zope.app.component/trunk/src/zope/app/component/back35.py 2008-04-28 18:16:20 UTC (rev 85828)
+++ zope.app.component/trunk/src/zope/app/component/back35.py 2008-04-28 19:31:09 UTC (rev 85829)
@@ -35,6 +35,7 @@
import zope.schema.vocabulary
from zope import interface, schema
from zope.traversing.interfaces import TraversalError
+from zope.traversing.api import getPath, getRoot, traverse
from zope.interface import implements
from zope.security.checker import InterfaceChecker, CheckerPublic
from zope.security.proxy import Proxy, removeSecurityProxy
@@ -47,7 +48,6 @@
import zope.app.component.interfaces.registration
import zope.app.container.interfaces
import zope.app.container.constraints
-from zope.app import zapi
from zope.app.component.i18n import ZopeMessageFactory as _
from zope.app.component.interfaces import registration as interfaces
from zope.app.container.btree import BTreeContainer
@@ -439,17 +439,17 @@
return self._component
def __BBB_old_getComponent(self, path):
- service_manager = zapi.getSiteManager(self)
+ service_manager = component.getSiteManager(self)
# Get the root and unproxy it
if path.startswith("/"):
# Absolute path
- root = removeAllProxies(zapi.getRoot(service_manager))
- component = zapi.traverse(root, path)
+ root = removeAllProxies(getRoot(service_manager))
+ component = traverse(root, path)
else:
# Relative path.
ancestor = self.__parent__.__parent__
- component = zapi.traverse(ancestor, path)
+ component = traverse(ancestor, path)
if self.permission:
if type(component) is Proxy:
@@ -475,7 +475,7 @@
def __BBB_getComponentPath(self):
if self._BBB_componentPath is not None:
return self._BBB_componentPath
- return '/' + '/'.join(zapi.getPath(self.component))
+ return '/' + '/'.join(getPath(self.component))
def __BBB_setComponentPath(self, path):
self._component = NULL_COMPONENT
@@ -640,7 +640,7 @@
component = property(component)
def getRegistry(self):
- return zapi.getSiteManager(self)
+ return component.getSiteManager(self)
class AdapterRegistration2(ComponentRegistration):
"""A simple implementation of the adapter registration interface."""
@@ -687,7 +687,7 @@
self.provided = provided
def getRegistry(self):
- return zapi.getSiteManager(self)
+ return component.getSiteManager(self)
class LayerField(GlobalObject):
Modified: zope.app.component/trunk/src/zope/app/component/site.txt
===================================================================
--- zope.app.component/trunk/src/zope/app/component/site.txt 2008-04-28 18:16:20 UTC (rev 85828)
+++ zope.app.component/trunk/src/zope/app/component/site.txt 2008-04-28 19:31:09 UTC (rev 85829)
@@ -158,8 +158,8 @@
registrations:
>>> gutil = MyUtility('Global Utility')
- >>> from zope.app import zapi
- >>> gsm = zapi.getGlobalSiteManager()
+ >>> from zope.component import getGlobalSiteManager
+ >>> gsm = getGlobalSiteManager()
>>> gsm.registerUtility(gutil, IMyUtility, 'gutil')
>>> sm.queryUtility(IMyUtility, 'gutil')
@@ -199,15 +199,17 @@
>>> hooks.setSite(myfolder)
-you can simply use the ZAPI's `getSiteManager()` method to get the nearest
-site manager:
+you can simply use the zope.component's `getSiteManager()` method to get
+the nearest site manager:
- >>> zapi.getSiteManager() is sm
+ >>> from zope.component import getSiteManager
+ >>> getSiteManager() is sm
True
-This also means that you can simply use ZAPI to look up your utility
+This also means that you can simply use zope.component to look up your utility
- >>> zapi.getUtility(IMyUtility, 'gutil')
+ >>> from zope.component import getUtility
+ >>> getUtility(IMyUtility, 'gutil')
MyUtility('Global Utility')
or the adapter via the interface's `__call__` method:
Modified: zope.app.component/trunk/src/zope/app/component/testing.py
===================================================================
--- zope.app.component/trunk/src/zope/app/component/testing.py 2008-04-28 18:16:20 UTC (rev 85828)
+++ zope.app.component/trunk/src/zope/app/component/testing.py 2008-04-28 19:31:09 UTC (rev 85829)
@@ -11,7 +11,7 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""Base Mix-in class for Placeful Setups
+"""Base Mix-in class for Placeful Setups
Also contains common test related classes/functions/objects.
@@ -22,11 +22,11 @@
import zope.interface
from zope.component.interfaces import IComponentLookup
from zope.app.component.interfaces import ILocalSiteManager
-from zope.app import zapi
from zope.app.testing import setup
from zope.app.testing.placelesssetup import PlacelessSetup
from zope.app.folder import rootFolder
from zope.app.testing.functional import ZCMLLayer
+from zope.traversing.api import traverse
AppComponentLayer = ZCMLLayer(
os.path.join(os.path.split(__file__)[0], 'ftesting.zcml'),
@@ -47,7 +47,7 @@
except KeyError:
root = inst.rootFolder = setup.buildSampleFolderTree()
- return zapi.traverse(root, self.path)
+ return traverse(root, self.path)
class PlacefulSetup(PlacelessSetup):
@@ -97,7 +97,7 @@
return self.makeSite()
def makeSite(self, path='/'):
- folder = zapi.traverse(self.rootFolder, path)
+ folder = traverse(self.rootFolder, path)
return setup.createSiteManager(folder, True)
def createRootFolder(self):
@@ -106,7 +106,7 @@
class SiteManagerStub(object):
zope.interface.implements(ILocalSiteManager)
-
+
__bases__ = ()
def __init__(self):
Modified: zope.app.component/trunk/src/zope/app/component/tests/test_contentdirective.py
===================================================================
--- zope.app.component/trunk/src/zope/app/component/tests/test_contentdirective.py 2008-04-28 18:16:20 UTC (rev 85828)
+++ zope.app.component/trunk/src/zope/app/component/tests/test_contentdirective.py 2008-04-28 19:31:09 UTC (rev 85829)
@@ -23,9 +23,9 @@
from zope.component.interface import queryInterface
from zope.configuration.xmlconfig import xmlconfig, XMLConfig
+import zope.component
import zope.app.security
import zope.app.component
-from zope.app import zapi
from zope.app.testing.placelesssetup import PlacelessSetup
# explicitly import ExampleClass and IExample using full paths
@@ -154,7 +154,7 @@
</class>
""")
xmlconfig(f)
- factory = zapi.getUtility(IFactory, 'test.Example')
+ factory = zope.component.getUtility(IFactory, 'test.Example')
self.assertEquals(factory.title, "Example content")
self.assertEquals(factory.description, "Example description")
@@ -170,9 +170,9 @@
</class>
""")
xmlconfig(f)
- self.assertRaises(ComponentLookupError, zapi.getUtility, IFactory,
- 'Example')
- factory = zapi.getUtility(
+ self.assertRaises(ComponentLookupError, zope.component.getUtility,
+ IFactory, 'Example')
+ factory = zope.component.getUtility(
IFactory, 'zope.app.component.tests.exampleclass.ExampleClass')
self.assertEquals(factory.title, "Example content")
self.assertEquals(factory.description, "Example description")
@@ -190,7 +190,7 @@
</class>
""")
xmlconfig(f)
- factory = zapi.getUtility(IFactory, 'test.Example')
+ factory = zope.component.getUtility(IFactory, 'test.Example')
self.assert_(hasattr(factory, '__Security_checker__'))
Modified: zope.app.component/trunk/src/zope/app/component/tests/test_directives.py
===================================================================
--- zope.app.component/trunk/src/zope/app/component/tests/test_directives.py 2008-04-28 18:16:20 UTC (rev 85828)
+++ zope.app.component/trunk/src/zope/app/component/tests/test_directives.py 2008-04-28 19:31:09 UTC (rev 85829)
@@ -21,9 +21,9 @@
import warnings
from cStringIO import StringIO
+import zope.component
from zope.interface import implements
from zope.testing.doctestunit import DocTestSuite
-from zope.component import createObject
from zope.component.interfaces import IDefaultViewName
from zope.component.interfaces import ComponentLookupError
from zope.component.interface import queryInterface
@@ -32,9 +32,9 @@
from zope.configuration.exceptions import ConfigurationError
from zope.configuration.xmlconfig import ZopeXMLConfigurationError
from zope.security.checker import ProxyFactory, selectChecker
+from zope.security import proxy
import zope.app.component
-from zope.app import zapi
from zope.app.testing.placelesssetup import PlacelessSetup
from zope.app.component.tests.adapter import A1, A2, A3
from zope.app.component.tests.adapter import I1, I2, I3, IS
@@ -87,7 +87,7 @@
ob = Ob()
request = Request(IV)
self.assertEqual(
- zapi.queryMultiAdapter((ob, request), name=u'test'), None)
+ zope.component.queryMultiAdapter((ob, request), name=u'test'), None)
xmlconfig(StringIO(template %
'''
@@ -99,7 +99,8 @@
))
self.assertEqual(
- zapi.queryMultiAdapter((ob, request), name=u'test').__class__,
+ zope.component.queryMultiAdapter((ob, request),
+ name=u'test').__class__,
V1)
@@ -120,7 +121,8 @@
a1 = A1()
a2 = A2()
request = Request(IV)
- view = zapi.queryMultiAdapter((ob, a1, a2, request), name=u'test')
+ view = zope.component.queryMultiAdapter((ob, a1, a2, request),
+ name=u'test')
self.assertEqual(view.__class__, A3)
self.assertEqual(view.context, (ob, a1, a2, request))
@@ -159,7 +161,7 @@
# The view should be a V1 around an A3, around an A2, around
# an A1, anround ob:
- view = zapi.queryMultiAdapter((ob, Request(IV)), name=u'test')
+ view = zope.component.queryMultiAdapter((ob, Request(IV)), name=u'test')
self.assertEqual(view.__class__, V1)
a3 = view.context
self.assertEqual(a3.__class__, A3)
@@ -186,7 +188,8 @@
def testViewThatProvidesAnInterface(self):
ob = Ob()
self.assertEqual(
- zapi.queryMultiAdapter((ob, Request(IR)), IV, u'test'), None)
+ zope.component.queryMultiAdapter((ob, Request(IR)), IV, u'test'),
+ None)
xmlconfig(StringIO(template %
'''
@@ -199,7 +202,8 @@
))
self.assertEqual(
- zapi.queryMultiAdapter((ob, Request(IR)), IV, u'test'), None)
+ zope.component.queryMultiAdapter((ob, Request(IR)), IV, u'test'),
+ None)
xmlconfig(StringIO(template %
'''
@@ -212,14 +216,14 @@
'''
))
- v = zapi.queryMultiAdapter((ob, Request(IR)), IV, u'test')
+ v = zope.component.queryMultiAdapter((ob, Request(IR)), IV, u'test')
self.assertEqual(v.__class__, V1)
def testUnnamedViewThatProvidesAnInterface(self):
ob = Ob()
self.assertEqual(
- zapi.queryMultiAdapter((ob, Request(IR)), IV), None)
+ zope.component.queryMultiAdapter((ob, Request(IR)), IV), None)
xmlconfig(StringIO(template %
'''
@@ -230,7 +234,7 @@
'''
))
- v = zapi.queryMultiAdapter((ob, Request(IR)), IV)
+ v = zope.component.queryMultiAdapter((ob, Request(IR)), IV)
self.assertEqual(v, None)
xmlconfig(StringIO(template %
@@ -243,7 +247,7 @@
'''
))
- v = zapi.queryMultiAdapter((ob, Request(IR)), IV)
+ v = zope.component.queryMultiAdapter((ob, Request(IR)), IV)
self.assertEqual(v.__class__, V1)
def testViewHavingARequiredClass(self):
@@ -258,13 +262,13 @@
)))
content = Content()
- a1 = zapi.getMultiAdapter((content, Request(IR)))
+ a1 = zope.component.getMultiAdapter((content, Request(IR)))
self.assert_(isinstance(a1, A1))
class MyContent:
implements(IContent)
- self.assertRaises(ComponentLookupError, zapi.getMultiAdapter,
+ self.assertRaises(ComponentLookupError, zope.component.getMultiAdapter,
(MyContent(), Request(IR)))
def testInterfaceProtectedView(self):
@@ -280,7 +284,8 @@
'''
))
- v = ProxyFactory(zapi.getMultiAdapter((Ob(), Request(IV)), name='test'))
+ v = ProxyFactory(zope.component.getMultiAdapter((Ob(), Request(IV)),
+ name='test'))
self.assertEqual(v.index(), 'V1 here')
self.assertRaises(Exception, getattr, v, 'action')
@@ -297,7 +302,8 @@
'''
))
- v = ProxyFactory(zapi.getMultiAdapter((Ob(), Request(IV)), name='test'))
+ v = ProxyFactory(zope.component.getMultiAdapter((Ob(), Request(IV)),
+ name='test'))
self.assertEqual(v.action(), 'done')
self.assertRaises(Exception, getattr, v, 'index')
@@ -315,7 +321,7 @@
'''
))
- v = zapi.getMultiAdapter((Ob(), Request(IV)), name='test')
+ v = zope.component.getMultiAdapter((Ob(), Request(IV)), name='test')
self.assertEqual(v.index(), 'V1 here')
self.assertEqual(v.action(), 'done')
@@ -333,7 +339,7 @@
'''
))
- v = zapi.getMultiAdapter((Ob(), Request(IV)), name='test')
+ v = zope.component.getMultiAdapter((Ob(), Request(IV)), name='test')
self.assertEqual(v.index(), 'V1 here')
self.assertEqual(v.action(), 'done')
@@ -371,7 +377,8 @@
def testDefaultView(self):
ob = Ob()
self.assertEqual(
- zapi.queryMultiAdapter((Ob(), Request(IV)), name='test'), None)
+ zope.component.queryMultiAdapter((Ob(), Request(IV)), name='test'),
+ None)
xmlconfig(StringIO(template % (
'''
@@ -382,16 +389,17 @@
)))
self.assertEqual(
- zapi.queryMultiAdapter((Ob(), Request(IV)), name='test'), None)
+ zope.component.queryMultiAdapter((Ob(), Request(IV)), name='test'),
+ None)
self.assertEqual(
- zapi.getGlobalSiteManager().adapters.lookup((IC, IV),
- IDefaultViewName),
+ zope.component.getGlobalSiteManager().adapters.lookup(
+ (IC, IV), IDefaultViewName),
'test')
def testResource(self):
ob = Ob()
self.assertEqual(
- zapi.queryAdapter(Request(IV), name=u'test'), None)
+ zope.component.queryAdapter(Request(IV), name=u'test'), None)
xmlconfig(StringIO(template % (
'''
<resource name="test"
@@ -401,12 +409,13 @@
)))
self.assertEqual(
- zapi.queryAdapter(Request(IV), name=u'test').__class__,
+ zope.component.queryAdapter(Request(IV), name=u'test').__class__,
R1)
def testResourceThatProvidesAnInterface(self):
ob = Ob()
- self.assertEqual(zapi.queryAdapter(Request(IR), IV, u'test'), None)
+ self.assertEqual(zope.component.queryAdapter(Request(IR), IV, u'test'),
+ None)
xmlconfig(StringIO(template %
'''
@@ -418,7 +427,7 @@
'''
))
- v = zapi.queryAdapter(Request(IR), IV, name=u'test')
+ v = zope.component.queryAdapter(Request(IR), IV, name=u'test')
self.assertEqual(v, None)
xmlconfig(StringIO(template %
@@ -432,12 +441,12 @@
'''
))
- v = zapi.queryAdapter(Request(IR), IV, name=u'test')
+ v = zope.component.queryAdapter(Request(IR), IV, name=u'test')
self.assertEqual(v.__class__, R1)
def testUnnamedResourceThatProvidesAnInterface(self):
ob = Ob()
- self.assertEqual(zapi.queryAdapter(Request(IR), IV), None)
+ self.assertEqual(zope.component.queryAdapter(Request(IR), IV), None)
xmlconfig(StringIO(template %
'''
@@ -448,7 +457,7 @@
'''
))
- v = zapi.queryAdapter(Request(IR), IV)
+ v = zope.component.queryAdapter(Request(IR), IV)
self.assertEqual(v, None)
xmlconfig(StringIO(template %
@@ -461,7 +470,7 @@
'''
))
- v = zapi.queryAdapter(Request(IR), IV)
+ v = zope.component.queryAdapter(Request(IR), IV)
self.assertEqual(v.__class__, R1)
def testResourceUndefinedPermission(self):
@@ -480,9 +489,10 @@
def testFactory(self):
showwarning = warnings.showwarning
warnings.showwarning = lambda *a, **k: None
-
- self.assertRaises(ComponentLookupError, zapi.createObject, 'foo')
+ self.assertRaises(ComponentLookupError, zope.component.createObject,
+ 'foo')
+
xmlconfig(StringIO(template % (
'''
<factory
@@ -493,7 +503,7 @@
)))
from factory import X
- self.assertEqual(zapi.createObject('foo.bar').__class__, X)
+ self.assertEqual(zope.component.createObject('foo.bar').__class__, X)
warnings.showwarning = showwarning
@@ -529,8 +539,8 @@
/>
</class>''')
xmlconfig(f)
- obj = createObject('test.Example')
- self.failUnless(zapi.isinstance(obj, exampleclass.ExampleClass))
+ obj = zope.component.createObject('test.Example')
+ self.failUnless(proxy.isinstance(obj, exampleclass.ExampleClass))
More information about the Checkins
mailing list