Author: jmorliaguet
Date: Thu Oct 13 00:02:50 2005
New Revision: 28227

Modified:
   
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/filters/content/__init__.py
   z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/filters/layout.py
   
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/filters/page/__init__.py
   z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/__init__.py
   z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/interfaces.py
   
z3lab/cpsskins/branches/jmo-perspectives/configuration/filters/metaconfigure.py
   z3lab/cpsskins/branches/jmo-perspectives/doc/portlet-rendering.txt
   z3lab/cpsskins/branches/jmo-perspectives/engines/common/filters/effect.py
   
z3lab/cpsskins/branches/jmo-perspectives/engines/common/filters/htmlcleaner.py
   z3lab/cpsskins/branches/jmo-perspectives/engines/common/filters/interfaces.py
   z3lab/cpsskins/branches/jmo-perspectives/engines/common/filters/layout.py
   z3lab/cpsskins/branches/jmo-perspectives/engines/common/filters/style.py
   z3lab/cpsskins/branches/jmo-perspectives/engines/common/filters/widget.py
   z3lab/cpsskins/branches/jmo-perspectives/engines/jsr168/filters/__init__.py
Log:
 
- path / import updates



Modified: 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/filters/content/__init__.py
==============================================================================
--- 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/filters/content/__init__.py
      (original)
+++ 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/filters/content/__init__.py
      Thu Oct 13 00:02:50 2005
@@ -22,7 +22,7 @@
 from zope.interface import implements
 from zope.publisher.interfaces import IRequest
 
-from cpsskins.browser.renderers.filters.interfaces import IFilter
+from cpsskins.browser.renderers.interfaces import IFilter
 from cpsskins.elements.interfaces import IDisplay
 
 class EditorFilter(BrowserView):

Modified: 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/filters/layout.py
==============================================================================
--- 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/filters/layout.py    
    (original)
+++ 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/filters/layout.py    
    Thu Oct 13 00:02:50 2005
@@ -22,7 +22,7 @@
 from zope.publisher.interfaces import IRequest
 
 from cpsskins.elements.formats.interfaces import IFormat
-from cpsskins.browser.renderers.filters.interfaces import IFilter
+from cpsskins.browser.renderers.interfaces import IFilter
 
 class LayoutEditor(object):
     """Apply a layout editor to the elements.

Modified: 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/filters/page/__init__.py
==============================================================================
--- 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/filters/page/__init__.py
 (original)
+++ 
z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/filters/page/__init__.py
 Thu Oct 13 00:02:50 2005
@@ -22,7 +22,7 @@
 from zope.interface import implements
 from zope.publisher.interfaces import IRequest
 
-from cpsskins.browser.renderers.filters.interfaces import IFilter
+from cpsskins.browser.renderers.interfaces import IFilter
 from cpsskins.elements.interfaces import IDisplay
 
 class EditorFilter(BrowserView):

Modified: z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/__init__.py
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/__init__.py      
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/__init__.py      
Thu Oct 13 00:02:50 2005
@@ -26,7 +26,7 @@
 from zope.security.proxy import removeSecurityProxy
 
 from cpsskins.browser.negociation.interfaces import INegociation
-from cpsskins.browser.renderers.filters.interfaces import IFilter
+from cpsskins.browser.renderers.interfaces import IFilter
 from cpsskins.configuration.interfaces import IRegistry
 from cpsskins.elements.interfaces import IElement, ISlot, IDisplayable
 from cpsskins.relations.interfaces import IPredicate

Modified: 
z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/interfaces.py
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/interfaces.py    
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/interfaces.py    
Thu Oct 13 00:02:50 2005
@@ -16,12 +16,17 @@
 $Id$
 """
 __docformat__ = "reStructuredText"
+
 from zope.interface import Interface
 
 # Rendering
+
 class IRenderer(Interface):
     """Renderers should implement this"""
 
+class IFilter(Interface):
+    """A rendering filter"""
+
 class IStylesheetRenderer(IRenderer):
     """Render a theme's stylesheets."""
 

Modified: 
z3lab/cpsskins/branches/jmo-perspectives/configuration/filters/metaconfigure.py
==============================================================================
--- 
z3lab/cpsskins/branches/jmo-perspectives/configuration/filters/metaconfigure.py 
    (original)
+++ 
z3lab/cpsskins/branches/jmo-perspectives/configuration/filters/metaconfigure.py 
    Thu Oct 13 00:02:50 2005
@@ -53,7 +53,7 @@
         raise ConfigurationError("Must specify a filter factory.")
 
     # zope:adapter
-    from cpsskins.browser.renderers.filters.interfaces import IFilter
+    from cpsskins.browser.renderers.interfaces import IFilter
     _context.action(
         discriminator = ('adapter', factory, for_, name),
         callable = provideAdapter,

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  Thu Oct 
13 00:02:50 2005
@@ -109,7 +109,7 @@
 the widget filter adapts the widget providing a view:
 
     >>> from cpsskins.engines.common.filters.widget import WidgetFilter
-    >>> from cpsskins.browser.renderers.filters.interfaces import IFilter
+    >>> from cpsskins.browser.renderers.interfaces import IFilter
     >>> from cpsskins.elements.formats.interfaces import IWidget
 
     >>> ztapi.provideAdapter((IWidget, IRequest), IFilter, WidgetFilter)

Modified: 
z3lab/cpsskins/branches/jmo-perspectives/engines/common/filters/effect.py
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/engines/common/filters/effect.py   
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/engines/common/filters/effect.py   
Thu Oct 13 00:02:50 2005
@@ -30,7 +30,7 @@
 
 from cpsskins.model.interfaces import IImage
 from cpsskins.elements.displays.interfaces import IDisplay
-from cpsskins.browser.renderers.filters.interfaces import IFilter
+from cpsskins.browser.renderers.interfaces import IFilter
 from cpsskins.thememanager import getThemeManager
 
 INFO = logging.INFO

Modified: 
z3lab/cpsskins/branches/jmo-perspectives/engines/common/filters/htmlcleaner.py
==============================================================================
--- 
z3lab/cpsskins/branches/jmo-perspectives/engines/common/filters/htmlcleaner.py  
    (original)
+++ 
z3lab/cpsskins/branches/jmo-perspectives/engines/common/filters/htmlcleaner.py  
    Thu Oct 13 00:02:50 2005
@@ -24,7 +24,7 @@
 from zope.publisher.interfaces import IRequest
 
 from cpsskins.elements.displays.interfaces import IDisplay
-from cpsskins.browser.renderers.filters.interfaces import IFilter
+from cpsskins.browser.renderers.interfaces import IFilter
 
 class HTMLCleaner(object):
     """Cleans and optimizes the html code.

Modified: 
z3lab/cpsskins/branches/jmo-perspectives/engines/common/filters/interfaces.py
==============================================================================
--- 
z3lab/cpsskins/branches/jmo-perspectives/engines/common/filters/interfaces.py   
    (original)
+++ 
z3lab/cpsskins/branches/jmo-perspectives/engines/common/filters/interfaces.py   
    Thu Oct 13 00:02:50 2005
@@ -19,9 +19,6 @@
 
 from zope.interface import Interface
 
-class IFilter(Interface):
-    """A rendering filter"""
-
 class IWidgetView(Interface):
     """A view for widgets"""
 

Modified: 
z3lab/cpsskins/branches/jmo-perspectives/engines/common/filters/layout.py
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/engines/common/filters/layout.py   
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/engines/common/filters/layout.py   
Thu Oct 13 00:02:50 2005
@@ -25,7 +25,7 @@
 from zope.security.proxy import removeSecurityProxy
 
 from cpsskins.elements.formats.interfaces import IFormat
-from cpsskins.browser.renderers.filters.interfaces import IFilter
+from cpsskins.browser.renderers.interfaces import IFilter
 
 startTag = re.compile('<.*?>')
 styleAttr = re.compile(' style="(.*?)"')

Modified: 
z3lab/cpsskins/branches/jmo-perspectives/engines/common/filters/style.py
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/engines/common/filters/style.py    
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/engines/common/filters/style.py    
Thu Oct 13 00:02:50 2005
@@ -24,7 +24,7 @@
 from zope.publisher.interfaces import IRequest
 
 from cpsskins.elements.formats.interfaces import IStyle, ICSSRenderer
-from cpsskins.browser.renderers.filters.interfaces import IFilter
+from cpsskins.browser.renderers.interfaces import IFilter
 
 startTag = re.compile('<.*?>')
 classAttr = re.compile(' class="(.*?)"')

Modified: 
z3lab/cpsskins/branches/jmo-perspectives/engines/common/filters/widget.py
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/engines/common/filters/widget.py   
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/engines/common/filters/widget.py   
Thu Oct 13 00:02:50 2005
@@ -25,7 +25,7 @@
 from zope.publisher.interfaces import IRequest
 from zope.schema.vocabulary import SimpleVocabulary
 
-from cpsskins.browser.renderers.filters.interfaces import IFilter
+from cpsskins.browser.renderers.interfaces import IFilter
 from cpsskins.configuration.interfaces import IRegistry
 from cpsskins.elements.formats.interfaces import IWidget
 from cpsskins.model import DisplayData, HTML

Modified: 
z3lab/cpsskins/branches/jmo-perspectives/engines/jsr168/filters/__init__.py
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/engines/jsr168/filters/__init__.py 
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/engines/jsr168/filters/__init__.py 
Thu Oct 13 00:02:50 2005
@@ -22,7 +22,7 @@
 from zope.interface import implements
 from zope.publisher.interfaces import IRequest
 
-from cpsskins.browser.renderers.filters.interfaces import IFilter
+from cpsskins.browser.renderers.interfaces import IFilter
 from cpsskins.elements.interfaces import ISlot
 from cpsskins.elements.interfaces import IDisplay
 
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

Reply via email to