Author: jmorliaguet
Date: Wed Oct 12 06:05:50 2005
New Revision: 28164
Modified:
z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/filters/widget.py
z3lab/cpsskins/branches/jmo-perspectives/configuration/engines/metadirectives.py
z3lab/cpsskins/branches/jmo-perspectives/configuration/filters/metadirectives.py
z3lab/cpsskins/branches/jmo-perspectives/configuration/formats/metadirectives.py
z3lab/cpsskins/branches/jmo-perspectives/configuration/portlets/metadirectives.py
z3lab/cpsskins/branches/jmo-perspectives/configuration/renderers/metaconfigure.py
z3lab/cpsskins/branches/jmo-perspectives/configuration/renderers/metadirectives.py
z3lab/cpsskins/branches/jmo-perspectives/configuration/storages/metadirectives.py
z3lab/cpsskins/branches/jmo-perspectives/configuration/widgets/metaconfigure.py
z3lab/cpsskins/branches/jmo-perspectives/configuration/widgets/metadirectives.py
z3lab/cpsskins/branches/jmo-perspectives/elements/formats/interfaces.py
z3lab/cpsskins/branches/jmo-perspectives/elements/interfaces.py
z3lab/cpsskins/branches/jmo-perspectives/interfaces.py
z3lab/cpsskins/branches/jmo-perspectives/model/interfaces.py
z3lab/cpsskins/branches/jmo-perspectives/portlets/actions/interfaces.py
z3lab/cpsskins/branches/jmo-perspectives/portlets/breadcrumbs/interfaces.py
z3lab/cpsskins/branches/jmo-perspectives/portlets/custom/__init__.py
z3lab/cpsskins/branches/jmo-perspectives/portlets/custom/interfaces.py
z3lab/cpsskins/branches/jmo-perspectives/portlets/dummy/interfaces.py
z3lab/cpsskins/branches/jmo-perspectives/portlets/image/interfaces.py
z3lab/cpsskins/branches/jmo-perspectives/portlets/macroslot/interfaces.py
Log:
- removed deprecation warnings on MessageIDFactory
Modified:
z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/filters/widget.py
==============================================================================
---
z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/filters/widget.py
(original)
+++
z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/filters/widget.py
Wed Oct 12 06:05:50 2005
@@ -21,7 +21,7 @@
from zope.component import adapts, getUtility
from zope.component import queryMultiAdapter, getMultiAdapter
from zope.interface import implements
-from zope.i18nmessageid import MessageIDFactory
+from zope.i18nmessageid import MessageFactory
from zope.publisher.interfaces import IRequest
from zope.schema.vocabulary import SimpleVocabulary
@@ -36,7 +36,7 @@
DEBUG = logging.DEBUG
logger = logging.getLogger()
-_ = MessageIDFactory("cpsskins")
+_ = MessageFactory("cpsskins")
widget_registry = getUtility(IRegistry, 'widgets')
widget_type_registry = getUtility(IRegistry, 'widget types')
Modified:
z3lab/cpsskins/branches/jmo-perspectives/configuration/engines/metadirectives.py
==============================================================================
---
z3lab/cpsskins/branches/jmo-perspectives/configuration/engines/metadirectives.py
(original)
+++
z3lab/cpsskins/branches/jmo-perspectives/configuration/engines/metadirectives.py
Wed Oct 12 06:05:50 2005
@@ -19,10 +19,10 @@
from zope.configuration.fields import GlobalObject
from zope.interface import Interface
-from zope.i18nmessageid import MessageIDFactory
+from zope.i18nmessageid import MessageFactory
from zope.schema import TextLine
-_ = MessageIDFactory("cpsskins")
+_ = MessageFactory("cpsskins")
class IEngineDirective(Interface):
Modified:
z3lab/cpsskins/branches/jmo-perspectives/configuration/filters/metadirectives.py
==============================================================================
---
z3lab/cpsskins/branches/jmo-perspectives/configuration/filters/metadirectives.py
(original)
+++
z3lab/cpsskins/branches/jmo-perspectives/configuration/filters/metadirectives.py
Wed Oct 12 06:05:50 2005
@@ -19,10 +19,10 @@
from zope.configuration.fields import GlobalObject, Path
from zope.interface import Interface
-from zope.i18nmessageid import MessageIDFactory
+from zope.i18nmessageid import MessageFactory
from zope.schema import TextLine
-_ = MessageIDFactory("cpsskins")
+_ = MessageFactory("cpsskins")
class IFilterDirective(Interface):
Modified:
z3lab/cpsskins/branches/jmo-perspectives/configuration/formats/metadirectives.py
==============================================================================
---
z3lab/cpsskins/branches/jmo-perspectives/configuration/formats/metadirectives.py
(original)
+++
z3lab/cpsskins/branches/jmo-perspectives/configuration/formats/metadirectives.py
Wed Oct 12 06:05:50 2005
@@ -19,10 +19,10 @@
from zope.configuration.fields import GlobalObject, Path, GlobalInterface
from zope.interface import Interface
-from zope.i18nmessageid import MessageIDFactory
+from zope.i18nmessageid import MessageFactory
from zope.schema import TextLine
-_ = MessageIDFactory("cpsskins")
+_ = MessageFactory("cpsskins")
class IFormatDirective(Interface):
Modified:
z3lab/cpsskins/branches/jmo-perspectives/configuration/portlets/metadirectives.py
==============================================================================
---
z3lab/cpsskins/branches/jmo-perspectives/configuration/portlets/metadirectives.py
(original)
+++
z3lab/cpsskins/branches/jmo-perspectives/configuration/portlets/metadirectives.py
Wed Oct 12 06:05:50 2005
@@ -20,8 +20,8 @@
from zope.configuration.fields import GlobalObject, GlobalInterface, Path
from zope.schema import TextLine
-from zope.i18nmessageid import MessageIDFactory
-_ = MessageIDFactory("cpsskins")
+from zope.i18nmessageid import MessageFactory
+_ = MessageFactory("cpsskins")
class IPortletDirective(Interface):
Modified:
z3lab/cpsskins/branches/jmo-perspectives/configuration/renderers/metaconfigure.py
==============================================================================
---
z3lab/cpsskins/branches/jmo-perspectives/configuration/renderers/metaconfigure.py
(original)
+++
z3lab/cpsskins/branches/jmo-perspectives/configuration/renderers/metaconfigure.py
Wed Oct 12 06:05:50 2005
@@ -20,14 +20,14 @@
from zope.app.component.metaconfigure import adapter
from zope.component import getUtility
from zope.configuration.exceptions import ConfigurationError
-from zope.i18nmessageid import MessageIDFactory
+from zope.i18nmessageid import MessageFactory
from zope.publisher.interfaces.browser import IBrowserRequest
from cpsskins.configuration.interfaces import IRegistry
from cpsskins.browser.renderers import Renderer as RenderingEngine
from cpsskins.browser.renderers.interfaces import IRenderer
-_ = MessageIDFactory("cpsskins")
+_ = MessageFactory("cpsskins")
renderer_registry = getUtility(IRegistry, 'renderers')
registered_adapters = []
Modified:
z3lab/cpsskins/branches/jmo-perspectives/configuration/renderers/metadirectives.py
==============================================================================
---
z3lab/cpsskins/branches/jmo-perspectives/configuration/renderers/metadirectives.py
(original)
+++
z3lab/cpsskins/branches/jmo-perspectives/configuration/renderers/metadirectives.py
Wed Oct 12 06:05:50 2005
@@ -19,10 +19,10 @@
from zope.configuration.fields import GlobalObject, Tokens
from zope.interface import Interface
-from zope.i18nmessageid import MessageIDFactory
+from zope.i18nmessageid import MessageFactory
from zope.schema import TextLine
-_ = MessageIDFactory("cpsskins")
+_ = MessageFactory("cpsskins")
class IRendererDirective(Interface):
Modified:
z3lab/cpsskins/branches/jmo-perspectives/configuration/storages/metadirectives.py
==============================================================================
---
z3lab/cpsskins/branches/jmo-perspectives/configuration/storages/metadirectives.py
(original)
+++
z3lab/cpsskins/branches/jmo-perspectives/configuration/storages/metadirectives.py
Wed Oct 12 06:05:50 2005
@@ -20,8 +20,8 @@
from zope.configuration.fields import GlobalObject
from zope.schema import TextLine
-from zope.i18nmessageid import MessageIDFactory
-_ = MessageIDFactory("cpsskins")
+from zope.i18nmessageid import MessageFactory
+_ = MessageFactory("cpsskins")
class IStorageDirective(Interface):
Modified:
z3lab/cpsskins/branches/jmo-perspectives/configuration/widgets/metaconfigure.py
==============================================================================
---
z3lab/cpsskins/branches/jmo-perspectives/configuration/widgets/metaconfigure.py
(original)
+++
z3lab/cpsskins/branches/jmo-perspectives/configuration/widgets/metaconfigure.py
Wed Oct 12 06:05:50 2005
@@ -20,14 +20,14 @@
from zope.app.component.metaconfigure import adapter
from zope.component import getUtility
from zope.configuration.exceptions import ConfigurationError
-from zope.i18nmessageid import MessageIDFactory
+from zope.i18nmessageid import MessageFactory
from zope.publisher.interfaces.browser import IBrowserRequest
from cpsskins.browser.renderers.filters.interfaces import IWidgetView
from cpsskins.browser.renderers.filters.interfaces import IBasicWidgetView
from cpsskins.configuration.interfaces import IRegistry
-_ = MessageIDFactory("cpsskins")
+_ = MessageFactory("cpsskins")
widget_registry = getUtility(IRegistry, 'widgets')
widget_type_registry = getUtility(IRegistry, 'widget types')
Modified:
z3lab/cpsskins/branches/jmo-perspectives/configuration/widgets/metadirectives.py
==============================================================================
---
z3lab/cpsskins/branches/jmo-perspectives/configuration/widgets/metadirectives.py
(original)
+++
z3lab/cpsskins/branches/jmo-perspectives/configuration/widgets/metadirectives.py
Wed Oct 12 06:05:50 2005
@@ -19,10 +19,10 @@
from zope.configuration.fields import GlobalObject
from zope.interface import Interface
-from zope.i18nmessageid import MessageIDFactory
+from zope.i18nmessageid import MessageFactory
from zope.schema import TextLine
-_ = MessageIDFactory("cpsskins")
+_ = MessageFactory("cpsskins")
class IWidgetDirective(Interface):
Modified:
z3lab/cpsskins/branches/jmo-perspectives/elements/formats/interfaces.py
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/elements/formats/interfaces.py
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/elements/formats/interfaces.py
Wed Oct 12 06:05:50 2005
@@ -18,13 +18,13 @@
__docformat__ = "reStructuredText"
from zope.app.container.interfaces import IContainer
-from zope.i18nmessageid import MessageIDFactory
+from zope.i18nmessageid import MessageFactory
from zope.interface import Interface
from zope.schema import Choice, Int
from cpsskins.elements.interfaces import IFormat
-_ = MessageIDFactory("cpsskins")
+_ = MessageFactory("cpsskins")
# format elements
Modified: z3lab/cpsskins/branches/jmo-perspectives/elements/interfaces.py
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/elements/interfaces.py
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/elements/interfaces.py Wed Oct
12 06:05:50 2005
@@ -21,12 +21,12 @@
from zope.app.container.constraints import contains, containers
from zope.app.container.interfaces import IContained
from zope.app.container.interfaces import IOrderedContainer, IItemContainer
-from zope.i18nmessageid import MessageIDFactory
+from zope.i18nmessageid import MessageFactory
from zope.interface import Interface
from zope.interface.interfaces import IInterface
from zope.schema import TextLine
-_ = MessageIDFactory("cpsskins")
+_ = MessageFactory("cpsskins")
# Elements
class IElement(IAttributeAnnotatable):
Modified: z3lab/cpsskins/branches/jmo-perspectives/interfaces.py
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/interfaces.py (original)
+++ z3lab/cpsskins/branches/jmo-perspectives/interfaces.py Wed Oct 12
06:05:50 2005
@@ -19,9 +19,9 @@
from zope.interface import Interface
from zope.app.cache.interfaces.ram import IRAMCache
-from zope.i18nmessageid import MessageIDFactory
+from zope.i18nmessageid import MessageFactory
-_ = MessageIDFactory("cpsskins")
+_ = MessageFactory("cpsskins")
# Theme management
Modified: z3lab/cpsskins/branches/jmo-perspectives/model/interfaces.py
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/model/interfaces.py
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/model/interfaces.py Wed Oct
12 06:05:50 2005
@@ -19,10 +19,10 @@
from zope.configuration.fields import GlobalObject, Tokens
from zope.interface import Interface
-from zope.i18nmessageid import MessageIDFactory
+from zope.i18nmessageid import MessageFactory
from zope.schema import Bool, Text, TextLine
-_ = MessageIDFactory("cpsskins")
+_ = MessageFactory("cpsskins")
class IDisplayData(Interface):
"""Display data structure.
Modified:
z3lab/cpsskins/branches/jmo-perspectives/portlets/actions/interfaces.py
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/portlets/actions/interfaces.py
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/portlets/actions/interfaces.py
Wed Oct 12 06:05:50 2005
@@ -17,11 +17,11 @@
"""
__docformat__ = "reStructuredText"
from zope.schema import TextLine
-from zope.i18nmessageid import MessageIDFactory
+from zope.i18nmessageid import MessageFactory
from cpsskins.elements.interfaces import IPortlet
-_ = MessageIDFactory("cpsskins")
+_ = MessageFactory("cpsskins")
class IActionsPortlet(IPortlet):
"""Interface for actions portlet"""
Modified:
z3lab/cpsskins/branches/jmo-perspectives/portlets/breadcrumbs/interfaces.py
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/portlets/breadcrumbs/interfaces.py
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/portlets/breadcrumbs/interfaces.py
Wed Oct 12 06:05:50 2005
@@ -16,11 +16,11 @@
$Id$
"""
__docformat__ = "reStructuredText"
-from zope.i18nmessageid import MessageIDFactory
+from zope.i18nmessageid import MessageFactory
from cpsskins.elements.interfaces import IPortlet
-_ = MessageIDFactory("cpsskins")
+_ = MessageFactory("cpsskins")
class IBreadcrumbsPortlet(IPortlet):
"""Interface for the breadcrumbs portlet"""
Modified: z3lab/cpsskins/branches/jmo-perspectives/portlets/custom/__init__.py
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/portlets/custom/__init__.py
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/portlets/custom/__init__.py
Wed Oct 12 06:05:50 2005
@@ -23,14 +23,14 @@
from zope.app.zptpage.zptpage import ZPTPage
from zope.app.dtmlpage.dtmlpage import DTMLPage
from ZODB.POSException import ConflictError
-from zope.i18nmessageid import MessageIDFactory
+from zope.i18nmessageid import MessageFactory
from cpsskins.elements.portlet import Portlet
from cpsskins.model import DisplayData, HTML
from interfaces import ICustomPortlet
from interfaces import ZPT_FORMAT, DTML_FORMAT
-_ = MessageIDFactory("cpsskins")
+_ = MessageFactory("cpsskins")
page_factories = {
ZPT_FORMAT: ZPTPage,
Modified: z3lab/cpsskins/branches/jmo-perspectives/portlets/custom/interfaces.py
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/portlets/custom/interfaces.py
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/portlets/custom/interfaces.py
Wed Oct 12 06:05:50 2005
@@ -17,13 +17,13 @@
"""
__docformat__ = "reStructuredText"
-from zope.i18nmessageid import MessageIDFactory
+from zope.i18nmessageid import MessageFactory
from zope.schema import Choice, Text
from zope.schema.vocabulary import SimpleVocabulary
from cpsskins.elements.interfaces import IPortlet
-_ = MessageIDFactory("cpsskins")
+_ = MessageFactory("cpsskins")
ZPT_FORMAT = "ZPT"
DTML_FORMAT = "DTML"
Modified: z3lab/cpsskins/branches/jmo-perspectives/portlets/dummy/interfaces.py
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/portlets/dummy/interfaces.py
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/portlets/dummy/interfaces.py
Wed Oct 12 06:05:50 2005
@@ -16,12 +16,13 @@
$Id$
"""
__docformat__ = "reStructuredText"
+
from zope.schema import Text
-from zope.i18nmessageid import MessageIDFactory
+from zope.i18nmessageid import MessageFactory
from cpsskins.elements.interfaces import IPortlet
-_ = MessageIDFactory("cpsskins")
+_ = MessageFactory("cpsskins")
class IDummyPortlet(IPortlet):
"""Interface for dummy portlet"""
Modified: z3lab/cpsskins/branches/jmo-perspectives/portlets/image/interfaces.py
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/portlets/image/interfaces.py
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/portlets/image/interfaces.py
Wed Oct 12 06:05:50 2005
@@ -19,11 +19,11 @@
from zope.app.file.interfaces import IImage
from zope.schema import TextLine, Bytes, BytesLine
-from zope.i18nmessageid import MessageIDFactory
+from zope.i18nmessageid import MessageFactory
from cpsskins.elements.interfaces import IPortlet
-_ = MessageIDFactory("cpsskins")
+_ = MessageFactory("cpsskins")
class IImagePortlet(IPortlet, IImage):
"""Interface for the image portlet"""
Modified:
z3lab/cpsskins/branches/jmo-perspectives/portlets/macroslot/interfaces.py
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/portlets/macroslot/interfaces.py
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/portlets/macroslot/interfaces.py
Wed Oct 12 06:05:50 2005
@@ -17,13 +17,13 @@
"""
__docformat__ = "reStructuredText"
-from zope.i18nmessageid import MessageIDFactory
+from zope.i18nmessageid import MessageFactory
from zope.publisher.interfaces.browser import ILayer, IDefaultBrowserLayer
from zope.publisher.interfaces.browser import IBrowserRequest
from cpsskins.elements.interfaces import IPortlet
-_ = MessageIDFactory("cpsskins")
+_ = MessageFactory("cpsskins")
class IMacrolessLayer(ILayer, IBrowserRequest):
"""The macroless layer"""
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
