Author: jmorliaguet
Date: Wed Mar 22 15:09:45 2006
New Revision: 2686
Modified:
cpsskins/branches/jmo-perspectives/configuration/displays/metaconfigure.py
cpsskins/branches/jmo-perspectives/configuration/formats/metaconfigure.py
cpsskins/branches/jmo-perspectives/configuration/portlets/metaconfigure.py
cpsskins/branches/jmo-perspectives/configuration/storages/metaconfigure.py
Log:
- removed more deprecation warnings
Modified:
cpsskins/branches/jmo-perspectives/configuration/displays/metaconfigure.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/configuration/displays/metaconfigure.py
(original)
+++ cpsskins/branches/jmo-perspectives/configuration/displays/metaconfigure.py
Wed Mar 22 15:09:45 2006
@@ -18,7 +18,7 @@
__docformat__ = "reStructuredText"
from zope.app.annotation.interfaces import IAttributeAnnotatable
-from zope.app.component.contentdirective import ContentDirective
+from zope.app.component.contentdirective import ClassDirective
from zope.app.component.metaconfigure import adapter
from zope.app.content.interfaces import IContentType
from zope.configuration.exceptions import ConfigurationError
@@ -50,7 +50,7 @@
raise ConfigurationError("Must specify a display factory.")
# zope:content
- c = ContentDirective(_context=_context, class_=factory)
+ c = ClassDirective(_context=_context, class_=factory)
c.implements(_context=_context,interface=(IAttributeAnnotatable,))
c.require(_context=_context,
permission="zope.View",
Modified:
cpsskins/branches/jmo-perspectives/configuration/formats/metaconfigure.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/configuration/formats/metaconfigure.py
(original)
+++ cpsskins/branches/jmo-perspectives/configuration/formats/metaconfigure.py
Wed Mar 22 15:09:45 2006
@@ -20,7 +20,7 @@
import os
from zope.app.annotation.interfaces import IAttributeAnnotatable
-from zope.app.component.contentdirective import ContentDirective
+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
@@ -61,7 +61,7 @@
raise ConfigurationError("Must specify a format predicate.")
# zope:content
- c = ContentDirective(_context=_context, class_=class_)
+ c = ClassDirective(_context=_context, class_=class_)
c.implements(_context=_context,interface=(IAttributeAnnotatable,))
c.require(_context=_context,
permission="zope.View",
Modified:
cpsskins/branches/jmo-perspectives/configuration/portlets/metaconfigure.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/configuration/portlets/metaconfigure.py
(original)
+++ cpsskins/branches/jmo-perspectives/configuration/portlets/metaconfigure.py
Wed Mar 22 15:09:45 2006
@@ -21,7 +21,7 @@
from zope.app.annotation.interfaces import IAttributeAnnotatable
from zope.app.form.browser.metaconfigure import EditFormDirective
-from zope.app.component.contentdirective import ContentDirective
+from zope.app.component.contentdirective import ClassDirective
from zope.app.publisher.browser.icon import IconDirective
from zope.app.publisher.browser.menumeta import addMenuItem
from zope.app.publisher.browser.resourcemeta import resource
@@ -91,7 +91,7 @@
)
# zope:content
- c = ContentDirective(_context=_context, class_=factory)
+ c = ClassDirective(_context=_context, class_=factory)
c.implements(_context=_context,interface=(schema, IAttributeAnnotatable))
c.require(_context=_context,
permission="zope.View",
Modified:
cpsskins/branches/jmo-perspectives/configuration/storages/metaconfigure.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/configuration/storages/metaconfigure.py
(original)
+++ cpsskins/branches/jmo-perspectives/configuration/storages/metaconfigure.py
Wed Mar 22 15:09:45 2006
@@ -17,7 +17,7 @@
"""
__docformat__ = "reStructuredText"
-from zope.app.component.contentdirective import ContentDirective
+from zope.app.component.contentdirective import ClassDirective
from zope.app.container.interfaces import IReadContainer, IWriteContainer
from zope.configuration.exceptions import ConfigurationError
@@ -42,7 +42,7 @@
interface = IStorage
# zope:content
- c = ContentDirective(_context=_context, class_=class_)
+ c = ClassDirective(_context=_context, class_=class_)
c.factory(_context=_context, title=title, description=description)
c.allow(_context=_context,
interface=(IReadContainer, interface))
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
