Author: jmorliaguet
Date: Sun Oct 30 12:01:24 2005
New Revision: 28816
Modified:
z3lab/cpsskins/branches/jmo-perspectives/browser/editing/editing.py
z3lab/cpsskins/branches/jmo-perspectives/browser/negociation/__init__.py
z3lab/cpsskins/branches/jmo-perspectives/browser/rendering/engine.py
z3lab/cpsskins/branches/jmo-perspectives/configuration/displays/metaconfigure.py
z3lab/cpsskins/branches/jmo-perspectives/configuration/displays/metadirectives.py
z3lab/cpsskins/branches/jmo-perspectives/configuration/portlets/metaconfigure.py
z3lab/cpsskins/branches/jmo-perspectives/configuration/presentations/metaconfigure.py
z3lab/cpsskins/branches/jmo-perspectives/configuration/presentations/metadirectives.py
z3lab/cpsskins/branches/jmo-perspectives/configuration/widgets/metaconfigure.py
z3lab/cpsskins/branches/jmo-perspectives/doc/portlet-rendering.txt
z3lab/cpsskins/branches/jmo-perspectives/elements/__init__.py
z3lab/cpsskins/branches/jmo-perspectives/elements/display.py
z3lab/cpsskins/branches/jmo-perspectives/elements/slot.py
z3lab/cpsskins/branches/jmo-perspectives/engines/authoring/authoring.py
z3lab/cpsskins/branches/jmo-perspectives/engines/authoring/jsonrpc.py
z3lab/cpsskins/branches/jmo-perspectives/engines/default/filters/effect/__init__.py
z3lab/cpsskins/branches/jmo-perspectives/engines/default/filters/style/jsonrpc.py
z3lab/cpsskins/branches/jmo-perspectives/engines/default/filters/widget/__init__.py
z3lab/cpsskins/branches/jmo-perspectives/engines/default/formats/interfaces.py
z3lab/cpsskins/branches/jmo-perspectives/engines/default/formats/style.py
z3lab/cpsskins/branches/jmo-perspectives/ftests/test_display.py
z3lab/cpsskins/branches/jmo-perspectives/ftests/test_format.py
z3lab/cpsskins/branches/jmo-perspectives/model/interfaces.py
z3lab/cpsskins/branches/jmo-perspectives/perspectives/__init__.py
z3lab/cpsskins/branches/jmo-perspectives/perspectives/interfaces.py
z3lab/cpsskins/branches/jmo-perspectives/portlets/actions/__init__.py
z3lab/cpsskins/branches/jmo-perspectives/portlets/breadcrumbs/__init__.py
z3lab/cpsskins/branches/jmo-perspectives/portlets/custom/__init__.py
z3lab/cpsskins/branches/jmo-perspectives/portlets/dummy/__init__.py
z3lab/cpsskins/branches/jmo-perspectives/portlets/image/__init__.py
z3lab/cpsskins/branches/jmo-perspectives/portlets/macroslot/__init__.py
Log:
- removed unused imports
Modified: z3lab/cpsskins/branches/jmo-perspectives/browser/editing/editing.py
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/browser/editing/editing.py
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/editing/editing.py Sun Oct
30 12:01:24 2005
@@ -25,11 +25,7 @@
from zope.interface import implements, Interface
from cpsskins.elements.interfaces import IElement
-from cpsskins.elements.interfaces import IPresentable, IDisplayable,
IFormattable
-from cpsskins.browser.tree.interfaces import INodeAdding, INodeRemoving
-from cpsskins.browser.tree.interfaces import INodeMoving, INodeOrdering
-from cpsskins.browser.tree.interfaces import INodeDuplicating
-from cpsskins.browser.rendering.interfaces import IViewer
+from cpsskins.elements.interfaces import IDisplayable, IFormattable
class IEditing(Interface):
Modified:
z3lab/cpsskins/branches/jmo-perspectives/browser/negociation/__init__.py
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/browser/negociation/__init__.py
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/negociation/__init__.py
Sun Oct 30 12:01:24 2005
@@ -20,8 +20,6 @@
from zope.app import zapi
from zope.app.publisher.browser import BrowserView
from zope.app.session.interfaces import ISession
-from zope.component import getUtilitiesFor
-from zope.interface import directlyProvidedBy
from cpsskins.browser.rendering.interfaces import IViewer
from cpsskins.thememanager import getThemeManager
Modified: z3lab/cpsskins/branches/jmo-perspectives/browser/rendering/engine.py
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/browser/rendering/engine.py
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/rendering/engine.py
Sun Oct 30 12:01:24 2005
@@ -22,7 +22,6 @@
from zope.app.traversing.api import getParent
from zope.app.zapi import getMultiAdapter, queryMultiAdapter
from zope.component import adapts, getUtility
-from zope.configuration.exceptions import ConfigurationError
from zope.interface import implements
from zope.publisher.interfaces import IRequest
Modified:
z3lab/cpsskins/branches/jmo-perspectives/configuration/displays/metaconfigure.py
==============================================================================
---
z3lab/cpsskins/branches/jmo-perspectives/configuration/displays/metaconfigure.py
(original)
+++
z3lab/cpsskins/branches/jmo-perspectives/configuration/displays/metaconfigure.py
Sun Oct 30 12:01:24 2005
@@ -17,13 +17,10 @@
"""
__docformat__ = "reStructuredText"
-import os
-
from zope.app.annotation.interfaces import IAttributeAnnotatable
from zope.app.component.contentdirective import ContentDirective
from zope.app.component.metaconfigure import adapter
from zope.app.content.interfaces import IContentType
-from zope.app.form.browser.metaconfigure import EditFormDirective
from zope.configuration.exceptions import ConfigurationError
from zope.component import getUtility
from zope.interface import alsoProvides
Modified:
z3lab/cpsskins/branches/jmo-perspectives/configuration/displays/metadirectives.py
==============================================================================
---
z3lab/cpsskins/branches/jmo-perspectives/configuration/displays/metadirectives.py
(original)
+++
z3lab/cpsskins/branches/jmo-perspectives/configuration/displays/metadirectives.py
Sun Oct 30 12:01:24 2005
@@ -17,7 +17,7 @@
"""
__docdisplay__ = "reStructuredText"
-from zope.configuration.fields import GlobalObject, Path, GlobalInterface
+from zope.configuration.fields import GlobalObject, GlobalInterface
from zope.interface import Interface
from zope.i18nmessageid import MessageFactory
from zope.schema import TextLine
Modified:
z3lab/cpsskins/branches/jmo-perspectives/configuration/portlets/metaconfigure.py
==============================================================================
---
z3lab/cpsskins/branches/jmo-perspectives/configuration/portlets/metaconfigure.py
(original)
+++
z3lab/cpsskins/branches/jmo-perspectives/configuration/portlets/metaconfigure.py
Sun Oct 30 12:01:24 2005
@@ -22,13 +22,12 @@
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.metaconfigure import adapter
from zope.app.publisher.browser.icon import IconDirective
from zope.app.publisher.browser.menumeta import addMenuItem
from zope.app.publisher.browser.resourcemeta import resource
from zope.app.content.interfaces import IContentType
from zope.configuration.exceptions import ConfigurationError
-from zope.interface import classImplements, Interface, alsoProvides
+from zope.interface import Interface, alsoProvides
from cpsskins import browser
Modified:
z3lab/cpsskins/branches/jmo-perspectives/configuration/presentations/metaconfigure.py
==============================================================================
---
z3lab/cpsskins/branches/jmo-perspectives/configuration/presentations/metaconfigure.py
(original)
+++
z3lab/cpsskins/branches/jmo-perspectives/configuration/presentations/metaconfigure.py
Sun Oct 30 12:01:24 2005
@@ -17,15 +17,11 @@
"""
__docformat__ = "reStructuredText"
-from zope.app.component.metaconfigure import adapter
from zope.component import getUtility
from zope.configuration.exceptions import ConfigurationError
from zope.i18nmessageid import MessageFactory
-from zope.publisher.interfaces.browser import IBrowserRequest
from cpsskins.configuration.interfaces import IRegistry
-from cpsskins.browser.rendering.engine import Renderer as RenderingEngine
-from cpsskins.browser.rendering.interfaces import IRenderer
_ = MessageFactory("cpsskins")
Modified:
z3lab/cpsskins/branches/jmo-perspectives/configuration/presentations/metadirectives.py
==============================================================================
---
z3lab/cpsskins/branches/jmo-perspectives/configuration/presentations/metadirectives.py
(original)
+++
z3lab/cpsskins/branches/jmo-perspectives/configuration/presentations/metadirectives.py
Sun Oct 30 12:01:24 2005
@@ -17,7 +17,7 @@
"""
__docformat__ = "reStructuredText"
-from zope.configuration.fields import GlobalObject, Tokens
+from zope.configuration.fields import GlobalObject
from zope.interface import Interface
from zope.i18nmessageid import MessageFactory
from zope.schema import TextLine
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
Sun Oct 30 12:01:24 2005
@@ -25,7 +25,7 @@
from cpsskins.configuration.interfaces import IRegistry
from cpsskins.engines.default.formats.interfaces import IWidget
-from cpsskins.filters.interfaces import IWidgetView, IBasicWidgetView
+from cpsskins.filters.interfaces import IWidgetView
_ = MessageFactory("cpsskins")
Modified: z3lab/cpsskins/branches/jmo-perspectives/doc/portlet-rendering.txt
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/doc/portlet-rendering.txt
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/doc/portlet-rendering.txt Sun Oct
30 12:01:24 2005
@@ -68,8 +68,8 @@
the box is then formatted with a widget.
- >>> from cpsskins.elements.formats.widget import Widget
- >>> from cpsskins.elements.formats.interfaces import IFormat
+ >>> from cpsskins.engines.default.formats.widget import Widget
+ >>> from cpsskins.elements.interfaces import IFormat
>>> verifyClass(IFormat, Widget)
True
@@ -84,8 +84,8 @@
the widget filter adapts the widget providing a view:
>>> from cpsskins.engines.default.filters.widget import WidgetFilter
+ >>> from cpsskins.engines.default.filters.widget import IWidget
>>> from cpsskins.browser.rendering.interfaces import IFilter
- >>> from cpsskins.elements.formats.interfaces import IWidget
>>> ztapi.provideAdapter((IWidget,), IFilter, WidgetFilter)
Modified: z3lab/cpsskins/branches/jmo-perspectives/elements/__init__.py
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/elements/__init__.py
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/elements/__init__.py Sun Oct
30 12:01:24 2005
@@ -18,7 +18,6 @@
__docformat__ = "reStructuredText"
from persistent import Persistent
-from zope.app import zapi
from zope.app.container.contained import Contained
from zope.app.container.ordered import OrderedContainer
from zope.app.container.interfaces import INameChooser
Modified: z3lab/cpsskins/branches/jmo-perspectives/elements/display.py
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/elements/display.py
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/elements/display.py Sun Oct
30 12:01:24 2005
@@ -26,7 +26,7 @@
from cpsskins.configuration.interfaces import IRegistry
from cpsskins.elements import Element
-from cpsskins.elements.interfaces import IType, IFormattable
+from cpsskins.elements.interfaces import IType
from cpsskins.perspectives.interfaces import IPerspective
from cpsskins.relations import DyadicRelation, TriadicRelation
from cpsskins.relations.tool import RelationTool
Modified: z3lab/cpsskins/branches/jmo-perspectives/elements/slot.py
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/elements/slot.py (original)
+++ z3lab/cpsskins/branches/jmo-perspectives/elements/slot.py Sun Oct 30
12:01:24 2005
@@ -21,9 +21,7 @@
from zope.component import adapts
from cpsskins.elements import InnerNode
-from cpsskins.elements.interfaces import (
- ILeaf, ISlot, INode, INodeTraverser, IPortlet,
- )
+from cpsskins.elements.interfaces import ISlot, INode, INodeTraverser
from cpsskins.ontology import hasPortlet, hasPortletFromPerspective
from cpsskins.relations.tool import RelationTool
from cpsskins.relations.interfaces import IRelatable
Modified:
z3lab/cpsskins/branches/jmo-perspectives/engines/authoring/authoring.py
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/engines/authoring/authoring.py
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/engines/authoring/authoring.py
Sun Oct 30 12:01:24 2005
@@ -24,11 +24,8 @@
from zope.interface import implements, Interface
from zope.security.proxy import removeSecurityProxy
-from cpsskins.elements.interfaces import IElement
-from cpsskins.elements.interfaces import IDisplayable, IFormattable,
IPresentable
-from cpsskins.browser.tree.interfaces import INodeAdding, INodeRemoving
-from cpsskins.browser.tree.interfaces import INodeMoving, INodeOrdering
-from cpsskins.browser.tree.interfaces import INodeDuplicating
+from cpsskins.elements.interfaces import IElement, IPresentable
+from cpsskins.elements.interfaces import IDisplayable, IFormattable
from cpsskins.browser.rendering.interfaces import IViewer
from cpsskins.thememanager import getThemeManager
Modified: z3lab/cpsskins/branches/jmo-perspectives/engines/authoring/jsonrpc.py
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/engines/authoring/jsonrpc.py
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/engines/authoring/jsonrpc.py
Sun Oct 30 12:01:24 2005
@@ -20,21 +20,14 @@
from zope.app import zapi
from zope.app.container.browser.contents import Contents
from zope.app.event.objectevent import ObjectCreatedEvent
-from zope.app.location.traversing import LocationPhysicallyLocatable
-from zope.app.publisher.browser import BrowserView
-from zope.app.session.interfaces import ISession
from zope.app.traversing.api import getParent
-from zope.app.zapi import queryMultiAdapter, getMultiAdapter
-from zope.component import adapts
+from zope.app.zapi import getMultiAdapter
from zope.component.interfaces import IFactory
from zope.event import notify
from zope.interface import implements
-from zope.security.proxy import removeSecurityProxy
from jsonserver.interfaces import IJSONRPCPublisher
-from cpsskins.elements.interfaces import IElement
-from cpsskins.elements.interfaces import IPresentable, IDisplayable,
IFormattable
from cpsskins.browser.tree.interfaces import INodeAdding, INodeRemoving
from cpsskins.browser.tree.interfaces import INodeMoving, INodeOrdering
from cpsskins.browser.tree.interfaces import INodeDuplicating
Modified:
z3lab/cpsskins/branches/jmo-perspectives/engines/default/filters/effect/__init__.py
==============================================================================
---
z3lab/cpsskins/branches/jmo-perspectives/engines/default/filters/effect/__init__.py
(original)
+++
z3lab/cpsskins/branches/jmo-perspectives/engines/default/filters/effect/__init__.py
Sun Oct 30 12:01:24 2005
@@ -23,7 +23,6 @@
from zope.app.file.image import Image
from zope.component import adapts
from zope.interface import implements
-from zope.publisher.interfaces import IRequest
from zope.schema.vocabulary import SimpleVocabulary
from zope.interface import Interface, providedBy
from zope.security.proxy import removeSecurityProxy
Modified:
z3lab/cpsskins/branches/jmo-perspectives/engines/default/filters/style/jsonrpc.py
==============================================================================
---
z3lab/cpsskins/branches/jmo-perspectives/engines/default/filters/style/jsonrpc.py
(original)
+++
z3lab/cpsskins/branches/jmo-perspectives/engines/default/filters/style/jsonrpc.py
Sun Oct 30 12:01:24 2005
@@ -17,8 +17,7 @@
"""
__docformat__ = "reStructuredText"
-from zope.app.container.btree import BTreeContainer
-from zope.component import adapts, getUtility
+from zope.component import getUtility
from zope.interface import implements
from jsonserver.interfaces import IJSONRPCPublisher
Modified:
z3lab/cpsskins/branches/jmo-perspectives/engines/default/filters/widget/__init__.py
==============================================================================
---
z3lab/cpsskins/branches/jmo-perspectives/engines/default/filters/widget/__init__.py
(original)
+++
z3lab/cpsskins/branches/jmo-perspectives/engines/default/filters/widget/__init__.py
Sun Oct 30 12:01:24 2005
@@ -22,7 +22,6 @@
from zope.component import queryMultiAdapter, getMultiAdapter
from zope.interface import implements
from zope.i18nmessageid import MessageFactory
-from zope.publisher.interfaces import IRequest
from zope.schema.vocabulary import SimpleVocabulary
from cpsskins.browser.rendering.interfaces import IFilter
Modified:
z3lab/cpsskins/branches/jmo-perspectives/engines/default/formats/interfaces.py
==============================================================================
---
z3lab/cpsskins/branches/jmo-perspectives/engines/default/formats/interfaces.py
(original)
+++
z3lab/cpsskins/branches/jmo-perspectives/engines/default/formats/interfaces.py
Sun Oct 30 12:01:24 2005
@@ -17,14 +17,6 @@
"""
__docformat__ = "reStructuredText"
-from zope.app.container.interfaces import IContainer
-from zope.i18nmessageid import MessageFactory
-from zope.interface import Interface
-from zope.schema import Choice, Int
-
from cpsskins.elements.interfaces import IFormat
-
from widget import IWidget
-_ = MessageFactory("cpsskins")
-
Modified:
z3lab/cpsskins/branches/jmo-perspectives/engines/default/formats/style.py
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/engines/default/formats/style.py
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/engines/default/formats/style.py
Sun Oct 30 12:01:24 2005
@@ -19,12 +19,10 @@
from zope.app.container.btree import BTreeContainer
from zope.app.container.interfaces import IContainer
-from zope.component import adapts, getUtility
-from zope.interface import implements, Interface
+from zope.component import getUtility
+from zope.interface import implements
from zope.i18nmessageid import MessageFactory
-from jsonserver.interfaces import IJSONRPCPublisher
-
from cpsskins.configuration.interfaces import IRegistry
from cpsskins.elements.format import Format
from cpsskins.elements.interfaces import IFormat
Modified: z3lab/cpsskins/branches/jmo-perspectives/ftests/test_display.py
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/ftests/test_display.py
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/ftests/test_display.py Sun Oct
30 12:01:24 2005
@@ -42,7 +42,7 @@
unittest.makeSuite(TestArea),
unittest.makeSuite(TestBox),
unittest.makeSuite(TestBoxGroup),
- DocTestSuite('cpsskins.elements.displays'),
+ DocTestSuite('cpsskins.elements.display'),
DocTestSuite('cpsskins.elements.displays.area'),
DocTestSuite('cpsskins.elements.displays.box'),
DocTestSuite('cpsskins.elements.displays.boxgroup'),
Modified: z3lab/cpsskins/branches/jmo-perspectives/ftests/test_format.py
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/ftests/test_format.py
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/ftests/test_format.py Sun Oct
30 12:01:24 2005
@@ -42,10 +42,10 @@
unittest.makeSuite(TestLayout),
unittest.makeSuite(TestStyle),
unittest.makeSuite(TestWidget),
- DocTestSuite('cpsskins.elements.formats'),
- DocTestSuite('cpsskins.elements.formats.layout'),
- DocTestSuite('cpsskins.elements.formats.style'),
- DocTestSuite('cpsskins.elements.formats.widget'),
+ DocTestSuite('cpsskins.elements.format'),
+ DocTestSuite('cpsskins.engines.default.formats.layout'),
+ DocTestSuite('cpsskins.engines.default.formats.style'),
+ DocTestSuite('cpsskins.engines.default.formats.widget'),
))
if __name__ == '__main__':
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 Sun Oct
30 12:01:24 2005
@@ -17,10 +17,10 @@
"""
__docformat__ = "reStructuredText"
-from zope.configuration.fields import GlobalObject, Tokens
+from zope.configuration.fields import Tokens
from zope.interface import Interface
from zope.i18nmessageid import MessageFactory
-from zope.schema import Bool, Text, TextLine
+from zope.schema import Bool, TextLine
_ = MessageFactory("cpsskins")
Modified: z3lab/cpsskins/branches/jmo-perspectives/perspectives/__init__.py
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/perspectives/__init__.py
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/perspectives/__init__.py Sun Oct
30 12:01:24 2005
@@ -20,7 +20,6 @@
from persistent import Persistent
from zope.interface import implements
-from cpsskins.elements import Element
from interfaces import IPerspective, ISitePerspective
class Perspective(object):
Modified: z3lab/cpsskins/branches/jmo-perspectives/perspectives/interfaces.py
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/perspectives/interfaces.py
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/perspectives/interfaces.py Sun Oct
30 12:01:24 2005
@@ -19,8 +19,6 @@
from zope.interface import Interface
-from cpsskins.elements.interfaces import IElement
-
class IPerspective(Interface):
"""A perspective."""
Modified: z3lab/cpsskins/branches/jmo-perspectives/portlets/actions/__init__.py
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/portlets/actions/__init__.py
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/portlets/actions/__init__.py
Sun Oct 30 12:01:24 2005
@@ -19,7 +19,6 @@
from persistent import Persistent
from zope.app.publisher.browser.menu import getMenu
-from zope.component import adapts
from zope.component.exceptions import ComponentLookupError
from zope.interface import implements
from zope.schema import TextLine
@@ -64,5 +63,5 @@
)
for ac in menu]
- info.data = items
+ info.data = Items(items)
Modified:
z3lab/cpsskins/branches/jmo-perspectives/portlets/breadcrumbs/__init__.py
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/portlets/breadcrumbs/__init__.py
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/portlets/breadcrumbs/__init__.py
Sun Oct 30 12:01:24 2005
@@ -19,7 +19,7 @@
from persistent import Persistent
from zope.app.traversing.browser.interfaces import IAbsoluteURL
-from zope.component import adapts, getMultiAdapter
+from zope.component import getMultiAdapter
from zope.interface import implements
from zope.i18nmessageid import MessageFactory
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
Sun Oct 30 12:01:24 2005
@@ -22,7 +22,6 @@
from zope.app.zptpage.zptpage import ZPTPage
from zope.app.dtmlpage.dtmlpage import DTMLPage
from zope.documenttemplate.documenttemplate import html_quote
-from zope.component import adapts
from zope.interface import implements
from ZODB.POSException import ConflictError
from zope.i18nmessageid import MessageFactory
Modified: z3lab/cpsskins/branches/jmo-perspectives/portlets/dummy/__init__.py
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/portlets/dummy/__init__.py
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/portlets/dummy/__init__.py Sun Oct
30 12:01:24 2005
@@ -18,7 +18,6 @@
__docformat__ = "reStructuredText"
from persistent import Persistent
-from zope.component import adapts
from zope.interface import implements
from zope.schema import Text
from zope.i18nmessageid import MessageFactory
Modified: z3lab/cpsskins/branches/jmo-perspectives/portlets/image/__init__.py
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/portlets/image/__init__.py
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/portlets/image/__init__.py Sun Oct
30 12:01:24 2005
@@ -17,10 +17,10 @@
"""
__docformat__ = "reStructuredText"
+from persistent import Persistent
from zope.app import zapi
from zope.app.file.image import Image as ImageFile
from zope.app.file.interfaces import IImage
-from zope.component import adapts
from zope.interface import implements
from zope.schema import TextLine, Bytes, BytesLine
from zope.i18nmessageid import MessageFactory
@@ -53,7 +53,7 @@
readonly=True,
)
-class ImagePortlet(ImageFile):
+class ImagePortlet(ImageFile, Persistent):
"""Image portlet
"""
implements(IImagePortlet)
Modified:
z3lab/cpsskins/branches/jmo-perspectives/portlets/macroslot/__init__.py
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/portlets/macroslot/__init__.py
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/portlets/macroslot/__init__.py
Sun Oct 30 12:01:24 2005
@@ -20,7 +20,6 @@
from persistent import Persistent
from zope.app import zapi
from zope.app.publisher.browser import applySkin
-from zope.component import adapts
from zope.interface import implements
from zope.i18nmessageid import MessageFactory
from zope.publisher.interfaces.browser import ILayer, IDefaultBrowserLayer
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
