Author: jmorliaguet
Date: Thu Oct 13 06:42:42 2005
New Revision: 28232

Added:
   z3lab/cpsskins/branches/jmo-perspectives/browser/rendering/
      - copied from r28228, 
z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/
   z3lab/cpsskins/branches/jmo-perspectives/browser/rendering/__init__.py
      - copied unchanged from r28231, 
z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/__init__.py
   z3lab/cpsskins/branches/jmo-perspectives/browser/rendering/configure.zcml
      - copied unchanged from r28231, 
z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/configure.zcml
   z3lab/cpsskins/branches/jmo-perspectives/browser/rendering/css.py
      - copied unchanged from r28231, 
z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/css.py
   z3lab/cpsskins/branches/jmo-perspectives/browser/rendering/engine.py
      - copied, changed from r28231, 
z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/engine.py
   z3lab/cpsskins/branches/jmo-perspectives/browser/rendering/interfaces.py
      - copied unchanged from r28231, 
z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/interfaces.py
Removed:
   z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/
Modified:
   z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/__init__.py
   
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/configure.zcml
   z3lab/cpsskins/branches/jmo-perspectives/browser/negociation/__init__.py
   
z3lab/cpsskins/branches/jmo-perspectives/configuration/filters/metaconfigure.py
   
z3lab/cpsskins/branches/jmo-perspectives/configuration/renderers/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/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
   z3lab/cpsskins/branches/jmo-perspectives/ftests/test_renderers.py
Log:

- renamed 'renderers' as 'rendering'



Modified: z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/__init__.py
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/__init__.py      
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/authoring/__init__.py      
Thu Oct 13 06:42:42 2005
@@ -37,7 +37,7 @@
 from cpsskins.browser.elements.interfaces import INodeAdding, INodeRemoving
 from cpsskins.browser.elements.interfaces import INodeMoving, INodeOrdering
 from cpsskins.browser.elements.interfaces import INodeDuplicating
-from cpsskins.browser.renderers.interfaces import IRenderer
+from cpsskins.browser.rendering.interfaces import IRenderer
 from cpsskins.thememanager import getThemeManager
 
 class Authoring(BrowserView):

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 06:42:42 2005
@@ -22,7 +22,7 @@
 from zope.interface import implements
 from zope.publisher.interfaces import IRequest
 
-from cpsskins.browser.renderers.interfaces import IFilter
+from cpsskins.browser.rendering.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 06:42:42 2005
@@ -22,7 +22,7 @@
 from zope.publisher.interfaces import IRequest
 
 from cpsskins.elements.formats.interfaces import IFormat
-from cpsskins.browser.renderers.interfaces import IFilter
+from cpsskins.browser.rendering.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 06:42:42 2005
@@ -22,7 +22,7 @@
 from zope.interface import implements
 from zope.publisher.interfaces import IRequest
 
-from cpsskins.browser.renderers.interfaces import IFilter
+from cpsskins.browser.rendering.interfaces import IFilter
 from cpsskins.elements.interfaces import IDisplay
 
 class EditorFilter(BrowserView):

Modified: z3lab/cpsskins/branches/jmo-perspectives/browser/configure.zcml
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/browser/configure.zcml     
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/configure.zcml     Thu Oct 
13 06:42:42 2005
@@ -186,7 +186,7 @@
 
   <include package=".authoring" />
 
-  <include package=".renderers" />
+  <include package=".rendering" />
 
   <include package=".icons" />
 

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    
Thu Oct 13 06:42:42 2005
@@ -24,7 +24,7 @@
 from zope.interface import directlyProvidedBy
 
 from cpsskins.configuration.engines.interfaces import IEngine
-from cpsskins.browser.renderers.interfaces import IRenderer
+from cpsskins.browser.rendering.interfaces import IRenderer
 from cpsskins.thememanager import getThemeManager
 
 class NegociationView(BrowserView):

Copied: z3lab/cpsskins/branches/jmo-perspectives/browser/rendering/engine.py 
(from r28231, 
z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/engine.py)
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/browser/renderers/engine.py        
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/browser/rendering/engine.py        
Thu Oct 13 06:42:42 2005
@@ -26,13 +26,12 @@
 from zope.security.proxy import removeSecurityProxy
 
 from cpsskins.browser.negociation.interfaces import INegociation
-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
 from cpsskins.storage.interfaces import IRelationStorage
 from cpsskins.thememanager import getThemeManager
-from interfaces import IRenderer
+from interfaces import IRenderer, IFilter
 
 import logging
 

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 06:42:42 2005
@@ -53,7 +53,7 @@
         raise ConfigurationError("Must specify a filter factory.")
 
     # zope:adapter
-    from cpsskins.browser.renderers.interfaces import IFilter
+    from cpsskins.browser.rendering.interfaces import IFilter
     _context.action(
         discriminator = ('adapter', factory, for_, name),
         callable = provideAdapter,

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
   Thu Oct 13 06:42:42 2005
@@ -24,8 +24,8 @@
 from zope.publisher.interfaces.browser import IBrowserRequest
 
 from cpsskins.configuration.interfaces import IRegistry
-from cpsskins.browser.renderers.engine import Renderer as RenderingEngine
-from cpsskins.browser.renderers.interfaces import IRenderer
+from cpsskins.browser.rendering.engine import Renderer as RenderingEngine
+from cpsskins.browser.rendering.interfaces import IRenderer
 
 _ = 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  Thu Oct 
13 06:42:42 2005
@@ -30,7 +30,7 @@
    to obtain the data, the portlet's getDisplayData()' method is called:
 
     >>> from cpsskins.model import DisplayData
-    >>> from cpsskins.browser.renderers.engine import Context
+    >>> from cpsskins.browser.rendering.engine import Context
     >>> info = Context({'request': request})
     >>> data = portlet.getDisplayData(info)
 
@@ -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.interfaces import IFilter
+    >>> from cpsskins.browser.rendering.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 06:42:42 2005
@@ -30,7 +30,7 @@
 
 from cpsskins.model.interfaces import IImage
 from cpsskins.elements.displays.interfaces import IDisplay
-from cpsskins.browser.renderers.interfaces import IFilter
+from cpsskins.browser.rendering.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 06:42:42 2005
@@ -24,7 +24,7 @@
 from zope.publisher.interfaces import IRequest
 
 from cpsskins.elements.displays.interfaces import IDisplay
-from cpsskins.browser.renderers.interfaces import IFilter
+from cpsskins.browser.rendering.interfaces import IFilter
 
 class HTMLCleaner(object):
     """Cleans and optimizes the html code.

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 06:42:42 2005
@@ -25,7 +25,7 @@
 from zope.security.proxy import removeSecurityProxy
 
 from cpsskins.elements.formats.interfaces import IFormat
-from cpsskins.browser.renderers.interfaces import IFilter
+from cpsskins.browser.rendering.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 06:42:42 2005
@@ -24,7 +24,7 @@
 from zope.publisher.interfaces import IRequest
 
 from cpsskins.elements.formats.interfaces import IStyle, ICSSRenderer
-from cpsskins.browser.renderers.interfaces import IFilter
+from cpsskins.browser.rendering.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 06:42:42 2005
@@ -25,7 +25,7 @@
 from zope.publisher.interfaces import IRequest
 from zope.schema.vocabulary import SimpleVocabulary
 
-from cpsskins.browser.renderers.interfaces import IFilter
+from cpsskins.browser.rendering.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 06:42:42 2005
@@ -22,7 +22,7 @@
 from zope.interface import implements
 from zope.publisher.interfaces import IRequest
 
-from cpsskins.browser.renderers.interfaces import IFilter
+from cpsskins.browser.rendering.interfaces import IFilter
 from cpsskins.elements.interfaces import ISlot
 from cpsskins.elements.interfaces import IDisplay
 

Modified: z3lab/cpsskins/branches/jmo-perspectives/ftests/test_renderers.py
==============================================================================
--- z3lab/cpsskins/branches/jmo-perspectives/ftests/test_renderers.py   
(original)
+++ z3lab/cpsskins/branches/jmo-perspectives/ftests/test_renderers.py   Thu Oct 
13 06:42:42 2005
@@ -23,7 +23,7 @@
 
 def test_suite():
     return unittest.TestSuite((
-        DocTestSuite('cpsskins.browser.renderers.engine'),
+        DocTestSuite('cpsskins.browser.rendering.engine'),
         DocFileSuite('../doc/canvas-rendering.txt'),
         DocFileSuite('../doc/draft-rendering-pipelines.txt'),
         ))
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

Reply via email to