Author: jmorliaguet
Date: Fri Apr 28 13:33:05 2006
New Revision: 2979
Modified:
cpsskins/branches/paris-sprint-2006/configuration/filters/metaconfigure.py
cpsskins/branches/paris-sprint-2006/configuration/formats/metaconfigure.py
cpsskins/branches/paris-sprint-2006/doc/portlet-rendering.txt
cpsskins/branches/paris-sprint-2006/doc/setup.txt
cpsskins/branches/paris-sprint-2006/setup/README.txt
cpsskins/branches/paris-sprint-2006/tests/test_relation_io.py
Log:
- register adapters using the new API
Modified:
cpsskins/branches/paris-sprint-2006/configuration/filters/metaconfigure.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/configuration/filters/metaconfigure.py
(original)
+++ cpsskins/branches/paris-sprint-2006/configuration/filters/metaconfigure.py
Fri Apr 28 13:33:05 2006
@@ -21,7 +21,7 @@
from zope.app import pagetemplate
from zope.app.publisher.browser.resourcemeta import resource
-from zope.component import provideAdapter, queryUtility
+from zope.component import queryUtility
from zope.component.zcml import utility, adapter
from zope.configuration.exceptions import ConfigurationError
@@ -50,10 +50,8 @@
"With a predicate, must specify an interface and a factory."
# zope:adapter
- _context.action(
- discriminator = ('adapter', factory, for_, name),
- callable = provideAdapter,
- args = (factory, (for_,), IFilterView, name))
+ adapter(_context=_context, factory=(factory,), provides=IFilterView,
+ for_=(for_,), name=name)
utility(_context=_context, provides=configuration.IFilter,
component=configuration.Filter(name=name, predicate=predicate),
Modified:
cpsskins/branches/paris-sprint-2006/configuration/formats/metaconfigure.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/configuration/formats/metaconfigure.py
(original)
+++ cpsskins/branches/paris-sprint-2006/configuration/formats/metaconfigure.py
Fri Apr 28 13:33:05 2006
@@ -23,7 +23,7 @@
from zope.app.component.contentdirective import ClassDirective
from zope.app.content.interfaces import IContentType
from zope.configuration.exceptions import ConfigurationError
-from zope.component import queryUtility, provideUtility
+from zope.component import queryUtility
from zope.component.zcml import utility, interface
from zope.component.interfaces import IFactory
from zope.interface import alsoProvides
Modified: cpsskins/branches/paris-sprint-2006/doc/portlet-rendering.txt
==============================================================================
--- cpsskins/branches/paris-sprint-2006/doc/portlet-rendering.txt
(original)
+++ cpsskins/branches/paris-sprint-2006/doc/portlet-rendering.txt Fri Apr
28 13:33:05 2006
@@ -192,7 +192,11 @@
>>> from cpsskins.standard.filters.widget import WidgetFilter
>>> from cpsskins.standard.formats.widget import IWidget
>>> from cpsskins.browser.rendering.interfaces import IFilterView
- >>> ztapi.provideAdapter(IWidget, IFilterView, WidgetFilter)
+
+ >>> from zope.app import zapi
+
+ >>> gsm = zapi.getGlobalSiteManager()
+ >>> gsm.registerAdapter(WidgetFilter, (IWidget,), IFilterView)
>>> def test_render(widget, rendered, info):
... widget_filter = IFilterView(widget)
Modified: cpsskins/branches/paris-sprint-2006/doc/setup.txt
==============================================================================
--- cpsskins/branches/paris-sprint-2006/doc/setup.txt (original)
+++ cpsskins/branches/paris-sprint-2006/doc/setup.txt Fri Apr 28 13:33:05 2006
@@ -66,7 +66,7 @@
configuration. They are registered as local utilities instead::
>>> sm = getSiteManager(context)
- >>> sm.provideUtility(accesskey, configuration.IAccessKey, name)
+ >>> sm.registerUtility(accesskey, configuration.IAccessKey, name)
>>> queryUtility(configuration.IAccessKey, name, context)
AccessKey(u'K', u'@@someurl.html')
Modified: cpsskins/branches/paris-sprint-2006/setup/README.txt
==============================================================================
--- cpsskins/branches/paris-sprint-2006/setup/README.txt (original)
+++ cpsskins/branches/paris-sprint-2006/setup/README.txt Fri Apr 28
13:33:05 2006
@@ -453,6 +453,8 @@
The last part of the URI is the resource's identifier as it is used in a
relation (cf. cpsskins.relations.interfaces.IRelatable).
+ >>> from zope.app import zapi
+
>>> from cpsskins.relations.interfaces import IRelatable
>>> from cpsskins.elements.interfaces import IElement
@@ -462,7 +464,8 @@
... def __str__(self):
... return '12345'
- >>> ztapi.provideAdapter(IElement, IRelatable, Relatable)
+ >>> gsm = zapi.getGlobalSiteManager()
+ >>> gsm.registerAdapter(Relatable, (IElement,), IRelatable)
>>> resource = Style()
>>> unicode(IRelatable(resource))
Modified: cpsskins/branches/paris-sprint-2006/tests/test_relation_io.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/tests/test_relation_io.py
(original)
+++ cpsskins/branches/paris-sprint-2006/tests/test_relation_io.py Fri Apr
28 13:33:05 2006
@@ -20,6 +20,7 @@
import re
import unittest
+from zope.app import zapi
from zope.app.component.testing import PlacefulSetup
from zope.app.testing import ztapi
from zope.component import getMultiAdapter
@@ -62,9 +63,12 @@
def setUp(self):
super(TestRelation, self).setUp()
from cpsskins.standard.io import relation
+
+ gsm = zapi.getGlobalSiteManager()
+
ztapi.browserViewProviding(IRelation, relation.Exporter, IDataExporter)
- ztapi.provideAdapter(IRelation, IDataImporter, relation.Importer)
- ztapi.provideAdapter(IRelatable, IIdentifiable, Identifiable)
+ gsm.registerAdapter(relation.Importer, (IRelation,), IDataImporter)
+ gsm.registerAdapter(Identifiable, (IRelatable,), IIdentifiable)
def test_export_monadic_relation(self):
from cpsskins.relations import MonadicRelation
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
