Author: jmorliaguet
Date: Wed Mar 22 15:05:06 2006
New Revision: 2685
Modified:
cpsskins/branches/jmo-perspectives/configure.zcml
cpsskins/branches/jmo-perspectives/elements/configure.zcml
cpsskins/branches/jmo-perspectives/model/configure.zcml
cpsskins/branches/jmo-perspectives/perspectives/configure.zcml
cpsskins/branches/jmo-perspectives/relations/configure.zcml
cpsskins/branches/jmo-perspectives/ui/default/filters/effect/__init__.py
cpsskins/branches/jmo-perspectives/ui/default/filters/effect/configure.zcml
cpsskins/branches/jmo-perspectives/ui/default/formats/configure.zcml
cpsskins/branches/jmo-perspectives/ui/default/formats/widget.py
Log:
- removed deprecation warnings
Modified: cpsskins/branches/jmo-perspectives/configure.zcml
==============================================================================
--- cpsskins/branches/jmo-perspectives/configure.zcml (original)
+++ cpsskins/branches/jmo-perspectives/configure.zcml Wed Mar 22 15:05:06 2006
@@ -37,7 +37,7 @@
<!-- Image cache -->
- <content class=".caching.ImageCache">
+ <class class=".caching.ImageCache">
<implements
interface=".interfaces.IImageCache"
@@ -53,7 +53,7 @@
interface=".interfaces.IImageCache"
/>
- </content>
+ </class>
<localUtility class=".setup.settings.Settings">
Modified: cpsskins/branches/jmo-perspectives/elements/configure.zcml
==============================================================================
--- cpsskins/branches/jmo-perspectives/elements/configure.zcml (original)
+++ cpsskins/branches/jmo-perspectives/elements/configure.zcml Wed Mar 22
15:05:06 2006
@@ -169,7 +169,7 @@
type="zope.app.content.interfaces.IContentType"
/>
- <content class=".themepage.ThemePage">
+ <class class=".themepage.ThemePage">
<implements
interface=".interfaces.IPageContained"
@@ -189,7 +189,7 @@
set_schema=".interfaces.IThemePage"
/>
- </content>
+ </class>
<cpsskins:presentation
for=".interfaces.IThemePage">
@@ -226,7 +226,7 @@
type="zope.app.content.interfaces.IContentType"
/>
- <content class=".pageblock.PageBlock">
+ <class class=".pageblock.PageBlock">
<implements
interface=".interfaces.IPageBlockContained"
@@ -246,7 +246,7 @@
set_schema=".interfaces.IPageBlock"
/>
- </content>
+ </class>
<cpsskins:presentation
for=".interfaces.IPageBlock">
@@ -284,7 +284,7 @@
type="zope.app.content.interfaces.IContentType"
/>
- <content class=".cell.Cell">
+ <class class=".cell.Cell">
<implements
interface=".interfaces.ICellContained"
@@ -304,7 +304,7 @@
set_schema=".interfaces.ICell"
/>
- </content>
+ </class>
<cpsskins:presentation
for=".interfaces.ICell">
@@ -348,7 +348,7 @@
type="zope.app.content.interfaces.IContentType"
/>
- <content class=".slot.Slot">
+ <class class=".slot.Slot">
<implements
interface=".interfaces.ISlotContained"
@@ -368,7 +368,7 @@
set_schema=".interfaces.ISlot"
/>
- </content>
+ </class>
<cpsskins:presentation
for=".interfaces.ISlot">
Modified: cpsskins/branches/jmo-perspectives/model/configure.zcml
==============================================================================
--- cpsskins/branches/jmo-perspectives/model/configure.zcml (original)
+++ cpsskins/branches/jmo-perspectives/model/configure.zcml Wed Mar 22
15:05:06 2006
@@ -3,31 +3,31 @@
<!-- to be moved to cpsskins.configuration -->
- <content class=".Item">
+ <class class=".Item">
<require
permission="zope.View"
interface=".interfaces.IItem"
/>
- </content>
+ </class>
- <content class=".Items">
+ <class class=".Items">
<require
permission="zope.View"
interface=".interfaces.IItems"
/>
- </content>
+ </class>
- <content class=".Image">
+ <class class=".Image">
<require
permission="zope.View"
interface=".interfaces.IImage"
/>
- </content>
+ </class>
</configure>
Modified: cpsskins/branches/jmo-perspectives/perspectives/configure.zcml
==============================================================================
--- cpsskins/branches/jmo-perspectives/perspectives/configure.zcml
(original)
+++ cpsskins/branches/jmo-perspectives/perspectives/configure.zcml Wed Mar
22 15:05:06 2006
@@ -6,7 +6,7 @@
i18n_domain="cpsskins"
>
- <content class=".Perspective">
+ <class class=".Perspective">
<require
permission="zope.View"
@@ -18,7 +18,7 @@
set_schema=".interfaces.IPerspective"
/>
- </content>
+ </class>
<!-- this adapter makes elements relatable -->
<adapter
Modified: cpsskins/branches/jmo-perspectives/relations/configure.zcml
==============================================================================
--- cpsskins/branches/jmo-perspectives/relations/configure.zcml (original)
+++ cpsskins/branches/jmo-perspectives/relations/configure.zcml Wed Mar 22
15:05:06 2006
@@ -3,7 +3,7 @@
xmlns:browser="http://namespaces.zope.org/browser";
xmlns:cpsskins="http://namespaces.zope.org/cpsskins";>
- <content class=".Relation">
+ <class class=".Relation">
<require
permission="zope.View"
@@ -15,10 +15,10 @@
set_schema=".interfaces.IRelation"
/>
- </content>
+ </class>
- <content class=".MonadicRelation">
+ <class class=".MonadicRelation">
<require
permission="zope.View"
@@ -30,10 +30,10 @@
set_schema=".interfaces.IMonadicRelation"
/>
- </content>
+ </class>
- <content class=".DyadicRelation">
+ <class class=".DyadicRelation">
<require
permission="zope.View"
@@ -45,10 +45,10 @@
set_schema=".interfaces.IDyadicRelation"
/>
- </content>
+ </class>
- <content class=".TriadicRelation">
+ <class class=".TriadicRelation">
<require
permission="zope.View"
@@ -60,7 +60,7 @@
set_schema=".interfaces.ITriadicRelation"
/>
- </content>
+ </class>
<!-- Relation storage -->
Modified:
cpsskins/branches/jmo-perspectives/ui/default/filters/effect/__init__.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/ui/default/filters/effect/__init__.py
(original)
+++ cpsskins/branches/jmo-perspectives/ui/default/filters/effect/__init__.py
Wed Mar 22 15:05:06 2006
@@ -21,8 +21,9 @@
from cStringIO import StringIO
from zope.app.file.image import Image
+from zope.app.schema.interfaces import IVocabularyFactory
from zope.component import adapts
-from zope.interface import implements
+from zope.interface import implements, alsoProvides
from zope.schema.vocabulary import SimpleVocabulary
from zope.security.proxy import removeSecurityProxy
@@ -111,7 +112,11 @@
"""
return SimpleVocabulary.fromItems([('Image scaling','scale')])
+alsoProvides(EffectsByTypeVocabulary, IVocabularyFactory)
+
def WebImageFormatVocabulary(context):
"""A vocabulary that contains the list of supported web image formats.
"""
return SimpleVocabulary.fromItems([('PNG','PNG'), ('JPEG', 'JPEG')])
+
+alsoProvides(WebImageFormatVocabulary, IVocabularyFactory)
Modified:
cpsskins/branches/jmo-perspectives/ui/default/filters/effect/configure.zcml
==============================================================================
--- cpsskins/branches/jmo-perspectives/ui/default/filters/effect/configure.zcml
(original)
+++ cpsskins/branches/jmo-perspectives/ui/default/filters/effect/configure.zcml
Wed Mar 22 15:05:06 2006
@@ -20,14 +20,16 @@
factory=".EffectFilter"
/>
- <vocabulary
+ <utility
+ provides="zope.app.schema.interfaces.IVocabularyFactory"
+ component=".EffectsByTypeVocabulary"
name="effects by type"
- factory=".EffectsByTypeVocabulary"
/>
- <vocabulary
+ <utility
+ provides="zope.app.schema.interfaces.IVocabularyFactory"
+ component=".WebImageFormatVocabulary"
name="web image formats"
- factory=".WebImageFormatVocabulary"
/>
</configure>
Modified: cpsskins/branches/jmo-perspectives/ui/default/formats/configure.zcml
==============================================================================
--- cpsskins/branches/jmo-perspectives/ui/default/formats/configure.zcml
(original)
+++ cpsskins/branches/jmo-perspectives/ui/default/formats/configure.zcml
Wed Mar 22 15:05:06 2006
@@ -45,9 +45,10 @@
predicate=".widget.hasWidget"
/>
- <vocabulary
+ <utility
+ provides="zope.app.schema.interfaces.IVocabularyFactory"
+ component=".widget.WidgetsVocabulary"
name="Widgets"
- factory=".widget.WidgetsVocabulary"
/>
<!-- Effect -->
Modified: cpsskins/branches/jmo-perspectives/ui/default/formats/widget.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/ui/default/formats/widget.py
(original)
+++ cpsskins/branches/jmo-perspectives/ui/default/formats/widget.py Wed Mar
22 15:05:06 2006
@@ -18,9 +18,10 @@
__docformat__ = "reStructuredText"
from persistent import Persistent
+from zope.app.schema.interfaces import IVocabularyFactory
from zope.component import getUtilitiesFor
from zope.component.factory import Factory
-from zope.interface import implements, implementedBy
+from zope.interface import implements, implementedBy, alsoProvides
from zope.i18nmessageid import MessageFactory
from zope.schema.vocabulary import SimpleVocabulary
from zope.schema import Choice
@@ -71,3 +72,4 @@
widgets.append((_(widget.title), id))
return SimpleVocabulary.fromItems(widgets)
+alsoProvides(WidgetsVocabulary, IVocabularyFactory)
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
