[Checkins] SVN: GenericSetup/trunk/ - import CA functions directly
from zope.component (reducing zope.app dependencies)
Yvo Schubbe
y.2006_ at wcm-solutions.de
Thu Apr 6 06:47:07 EDT 2006
Log message for revision 66587:
- import CA functions directly from zope.component (reducing zope.app dependencies)
Changed:
U GenericSetup/trunk/PluginIndexes/exportimport.py
U GenericSetup/trunk/ZCatalog/exportimport.py
U GenericSetup/trunk/ZCatalog/tests/test_exportimport.py
U GenericSetup/trunk/content.py
U GenericSetup/trunk/testing.py
U GenericSetup/trunk/utils.py
-=-
Modified: GenericSetup/trunk/PluginIndexes/exportimport.py
===================================================================
--- GenericSetup/trunk/PluginIndexes/exportimport.py 2006-04-06 10:20:25 UTC (rev 66586)
+++ GenericSetup/trunk/PluginIndexes/exportimport.py 2006-04-06 10:47:06 UTC (rev 66587)
@@ -15,7 +15,7 @@
$Id$
"""
-from zope.app import zapi
+from zope.component import queryMultiAdapter
from Products.GenericSetup.interfaces import INode
from Products.GenericSetup.utils import NodeAdapterBase
@@ -198,7 +198,7 @@
"""
node = self._getObjectNode('index')
for set in self.context.filteredSets.values():
- exporter = zapi.queryMultiAdapter((set, self.environ), INode)
+ exporter = queryMultiAdapter((set, self.environ), INode)
node.appendChild(exporter.node)
return node
@@ -212,7 +212,7 @@
set_meta_type = str(child.getAttribute('meta_type'))
self.context.addFilteredSet(set_id, set_meta_type, '')
set = self.context.filteredSets[set_id]
- importer = zapi.queryMultiAdapter((set, self.environ), INode)
+ importer = queryMultiAdapter((set, self.environ), INode)
importer.node = child
self.context.clear()
Modified: GenericSetup/trunk/ZCatalog/exportimport.py
===================================================================
--- GenericSetup/trunk/ZCatalog/exportimport.py 2006-04-06 10:20:25 UTC (rev 66586)
+++ GenericSetup/trunk/ZCatalog/exportimport.py 2006-04-06 10:47:06 UTC (rev 66587)
@@ -15,7 +15,7 @@
$Id$
"""
-from zope.app import zapi
+from zope.component import queryMultiAdapter
from Products.GenericSetup.interfaces import INode
from Products.GenericSetup.utils import ObjectManagerHelpers
@@ -75,7 +75,7 @@
indexes = self.context.getIndexObjects()[:]
indexes.sort(lambda x,y: cmp(x.getId(), y.getId()))
for idx in indexes:
- exporter = zapi.queryMultiAdapter((idx, self.environ), INode)
+ exporter = queryMultiAdapter((idx, self.environ), INode)
if exporter:
fragment.appendChild(exporter.node)
return fragment
@@ -106,7 +106,7 @@
zcatalog.addIndex(idx_id, meta_type, extra)
idx = zcatalog._catalog.getIndex(idx_id)
- importer = zapi.queryMultiAdapter((idx, self.environ), INode)
+ importer = queryMultiAdapter((idx, self.environ), INode)
if importer:
importer.node = child
Modified: GenericSetup/trunk/ZCatalog/tests/test_exportimport.py
===================================================================
--- GenericSetup/trunk/ZCatalog/tests/test_exportimport.py 2006-04-06 10:20:25 UTC (rev 66586)
+++ GenericSetup/trunk/ZCatalog/tests/test_exportimport.py 2006-04-06 10:47:06 UTC (rev 66587)
@@ -21,7 +21,7 @@
Zope2.startup()
from Products.Five import zcml
-from zope.app import zapi
+from zope.component import getMultiAdapter
from Products.GenericSetup.interfaces import IBody
from Products.GenericSetup.testing import BodyAdapterTestCase
@@ -149,7 +149,7 @@
def test_body_get_special(self):
self._populate_special(self._obj)
context = DummySetupEnviron()
- adapted = zapi.getMultiAdapter((self._obj, context), IBody)
+ adapted = getMultiAdapter((self._obj, context), IBody)
self.assertEqual(adapted.body,
_CATALOG_BODY % (_VOCABULARY_XML, _TEXT_XML))
Modified: GenericSetup/trunk/content.py
===================================================================
--- GenericSetup/trunk/content.py 2006-04-06 10:20:25 UTC (rev 66586)
+++ GenericSetup/trunk/content.py 2006-04-06 10:47:06 UTC (rev 66587)
@@ -22,9 +22,9 @@
import re
from StringIO import StringIO
+from zope.component import queryAdapter
from zope.interface import implements
from zope.interface import directlyProvides
-from zope.app import zapi
from interfaces import IContentFactory
from interfaces import IContentFactoryName
@@ -207,10 +207,10 @@
factory = _factory
else:
- factory = zapi.queryAdapter(self.context,
- IContentFactory,
- name=type_name,
- )
+ factory = queryAdapter(self.context,
+ IContentFactory,
+ name=type_name,
+ )
if factory is None:
return None
Modified: GenericSetup/trunk/testing.py
===================================================================
--- GenericSetup/trunk/testing.py 2006-04-06 10:20:25 UTC (rev 66586)
+++ GenericSetup/trunk/testing.py 2006-04-06 10:47:06 UTC (rev 66587)
@@ -22,7 +22,7 @@
import Products.Five
from Products.Five import zcml
-from zope.app import zapi
+from zope.component import getMultiAdapter
from zope.interface import implements
from zope.interface.verify import verifyClass
@@ -89,25 +89,25 @@
def test_body_get(self):
self._populate(self._obj)
context = DummySetupEnviron()
- adapted = zapi.getMultiAdapter((self._obj, context), IBody)
+ adapted = getMultiAdapter((self._obj, context), IBody)
self.assertEqual(adapted.body, self._BODY)
def test_body_set(self):
context = DummySetupEnviron()
- adapted = zapi.getMultiAdapter((self._obj, context), IBody)
+ adapted = getMultiAdapter((self._obj, context), IBody)
adapted.body = self._BODY
self._verifyImport(self._obj)
self.assertEqual(adapted.body, self._BODY)
# now in update mode
context._should_purge = False
- adapted = zapi.getMultiAdapter((self._obj, context), IBody)
+ adapted = getMultiAdapter((self._obj, context), IBody)
adapted.body = self._BODY
self._verifyImport(self._obj)
self.assertEqual(adapted.body, self._BODY)
# and again in update mode
- adapted = zapi.getMultiAdapter((self._obj, context), IBody)
+ adapted = getMultiAdapter((self._obj, context), IBody)
adapted.body = self._BODY
self._verifyImport(self._obj)
self.assertEqual(adapted.body, self._BODY)
@@ -120,25 +120,25 @@
def test_node_get(self):
self._populate(self._obj)
context = DummySetupEnviron()
- adapted = zapi.getMultiAdapter((self._obj, context), INode)
+ adapted = getMultiAdapter((self._obj, context), INode)
self.assertEqual(adapted.node.toprettyxml(' '), self._XML)
def test_node_set(self):
context = DummySetupEnviron()
- adapted = zapi.getMultiAdapter((self._obj, context), INode)
+ adapted = getMultiAdapter((self._obj, context), INode)
adapted.node = parseString(self._XML).documentElement
self._verifyImport(self._obj)
self.assertEqual(adapted.node.toprettyxml(' '), self._XML)
# now in update mode
context._should_purge = False
- adapted = zapi.getMultiAdapter((self._obj, context), INode)
+ adapted = getMultiAdapter((self._obj, context), INode)
adapted.node = parseString(self._XML).documentElement
self._verifyImport(self._obj)
self.assertEqual(adapted.node.toprettyxml(' '), self._XML)
# and again in update mode
- adapted = zapi.getMultiAdapter((self._obj, context), INode)
+ adapted = getMultiAdapter((self._obj, context), INode)
adapted.node = parseString(self._XML).documentElement
self._verifyImport(self._obj)
self.assertEqual(adapted.node.toprettyxml(' '), self._XML)
Modified: GenericSetup/trunk/utils.py
===================================================================
--- GenericSetup/trunk/utils.py 2006-04-06 10:20:25 UTC (rev 66586)
+++ GenericSetup/trunk/utils.py 2006-04-06 10:47:06 UTC (rev 66587)
@@ -37,7 +37,7 @@
#BBB: for Zope 2.8
from Products.Five.bbb.OFS_interfaces import IOrderedContainer
from cgi import escape
-from zope.app import zapi
+from zope.component import queryMultiAdapter
from zope.interface import implements
from zope.interface import implementsOnly
from zope.interface import providedBy
@@ -531,7 +531,7 @@
objects = list(objects)
objects.sort(lambda x,y: cmp(x.getId(), y.getId()))
for obj in objects:
- exporter = zapi.queryMultiAdapter((obj, self.environ), INode)
+ exporter = queryMultiAdapter((obj, self.environ), INode)
if exporter:
fragment.appendChild(exporter.node)
return fragment
@@ -589,7 +589,7 @@
pass
obj = getattr(self.context, obj_id)
- importer = zapi.queryMultiAdapter((obj, self.environ), INode)
+ importer = queryMultiAdapter((obj, self.environ), INode)
if importer:
importer.node = child
@@ -711,7 +711,7 @@
def exportObjects(obj, parent_path, context):
""" Export subobjects recursively.
"""
- exporter = zapi.queryMultiAdapter((obj, context), IBody)
+ exporter = queryMultiAdapter((obj, context), IBody)
path = '%s%s' % (parent_path, obj.getId().replace(' ', '_'))
if exporter:
if exporter.name:
@@ -728,7 +728,7 @@
def importObjects(obj, parent_path, context):
""" Import subobjects recursively.
"""
- importer = zapi.queryMultiAdapter((obj, context), IBody)
+ importer = queryMultiAdapter((obj, context), IBody)
path = '%s%s' % (parent_path, obj.getId().replace(' ', '_'))
__traceback_info__ = path
if importer:
More information about the Checkins
mailing list