[Checkins] SVN: zope.app.renderer/trunk/ Removed deprecated meta.zcml stuff and zpkg stuff. Replaced __used_for__ with zope.component.adapts calls.
Dan Korostelev
nadako at gmail.com
Sat Jan 17 07:54:26 EST 2009
Log message for revision 94785:
Removed deprecated meta.zcml stuff and zpkg stuff. Replaced __used_for__ with zope.component.adapts calls.
Changed:
U zope.app.renderer/trunk/CHANGES.txt
D zope.app.renderer/trunk/src/zope/app/renderer/DEPENDENCIES.cfg
D zope.app.renderer/trunk/src/zope/app/renderer/SETUP.cfg
D zope.app.renderer/trunk/src/zope/app/renderer/meta.zcml
D zope.app.renderer/trunk/src/zope/app/renderer/metaconfigure.py
U zope.app.renderer/trunk/src/zope/app/renderer/plaintext.py
D zope.app.renderer/trunk/src/zope/app/renderer/renderer-configure.zcml
D zope.app.renderer/trunk/src/zope/app/renderer/renderer-meta.zcml
U zope.app.renderer/trunk/src/zope/app/renderer/rest.py
U zope.app.renderer/trunk/src/zope/app/renderer/stx.py
-=-
Modified: zope.app.renderer/trunk/CHANGES.txt
===================================================================
--- zope.app.renderer/trunk/CHANGES.txt 2009-01-17 12:38:09 UTC (rev 94784)
+++ zope.app.renderer/trunk/CHANGES.txt 2009-01-17 12:54:26 UTC (rev 94785)
@@ -11,6 +11,10 @@
Instead, use publish_parts and join needed parts in the ``render``
method of the renderer itself.
+- Removed deprecated meta.zcml stuff and zpkg stuff.
+
+- Replaced __used_for__ with zope.component.adapts calls.
+
3.4.0 (2007-10-27)
------------------
Deleted: zope.app.renderer/trunk/src/zope/app/renderer/DEPENDENCIES.cfg
===================================================================
--- zope.app.renderer/trunk/src/zope/app/renderer/DEPENDENCIES.cfg 2009-01-17 12:38:09 UTC (rev 94784)
+++ zope.app.renderer/trunk/src/zope/app/renderer/DEPENDENCIES.cfg 2009-01-17 12:54:26 UTC (rev 94785)
@@ -1,8 +0,0 @@
-docutils
-zope.app
-zope.component
-zope.configuration
-zope.interface
-zope.schema
-zope.structuredtext
-zope.testing
Deleted: zope.app.renderer/trunk/src/zope/app/renderer/SETUP.cfg
===================================================================
--- zope.app.renderer/trunk/src/zope/app/renderer/SETUP.cfg 2009-01-17 12:38:09 UTC (rev 94784)
+++ zope.app.renderer/trunk/src/zope/app/renderer/SETUP.cfg 2009-01-17 12:54:26 UTC (rev 94785)
@@ -1,5 +0,0 @@
-# Tell zpkg how to install the ZCML slugs.
-
-<data-files zopeskel/etc/package-includes>
- renderer-*.zcml
-</data-files>
Deleted: zope.app.renderer/trunk/src/zope/app/renderer/meta.zcml
===================================================================
--- zope.app.renderer/trunk/src/zope/app/renderer/meta.zcml 2009-01-17 12:38:09 UTC (rev 94784)
+++ zope.app.renderer/trunk/src/zope/app/renderer/meta.zcml 2009-01-17 12:54:26 UTC (rev 94785)
@@ -1,12 +0,0 @@
-<configure
- xmlns="http://namespaces.zope.org/zope"
- xmlns:meta="http://namespaces.zope.org/meta">
-
- <!-- BBB 2006/02/24, to be removed after 12 months -->
- <meta:directive
- namespace="http://namespaces.zope.org/renderer"
- name="renderer"
- schema=".metaconfigure.IRendererDirective"
- handler=".metaconfigure.renderer" />
-
-</configure>
\ No newline at end of file
Deleted: zope.app.renderer/trunk/src/zope/app/renderer/metaconfigure.py
===================================================================
--- zope.app.renderer/trunk/src/zope/app/renderer/metaconfigure.py 2009-01-17 12:38:09 UTC (rev 94784)
+++ zope.app.renderer/trunk/src/zope/app/renderer/metaconfigure.py 2009-01-17 12:54:26 UTC (rev 94785)
@@ -1,85 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-"""Renderer configuration code
-
-$Id$
-"""
-# BBB 2006/02/24, to be removed after 12 months
-
-import warnings
-from zope.component.zcml import handler
-from zope.configuration.fields import GlobalInterface, GlobalObject
-from zope.interface import Interface
-
-class IRendererDirective(Interface):
- """
- *BBB: DEPRECATED*
-
- The 'renderer' directive has been deprecated and will be
- removed in Zope 3.5. Use the 'view' directive instead.
-
- Example::
-
- <browser:view
- name=""
- for="some.interface"
- class="some.class"
- permission="zope.Public"
- />
-
- Register a renderer for a particular output interface, such as
- IBrowserView.
- """
-
- sourceType = GlobalInterface(
- title=u"Source Type Interface",
- description=u"Specifies an interface for of a particular source type.",
- required=True)
-
- for_ = GlobalInterface(
- title=u"Interface of the output type",
- description=u"Specifies the interface of the output type (i.e. "
- u"browser) for which this view is being registered.",
- required=True)
-
- factory = GlobalObject(
- title=u"Factory",
- description=u"Specifies the factory that is used to create the "
- u"view on the source.",
- required=True)
-
-# TODO: Does not seem to be tested
-def renderer(_context, sourceType, for_, factory):
- def dottify(obj):
- try:
- return obj.__module__ + '.' + obj.__name__
- except AttributeError:
- return '...'
- warnings.warn_explicit(
- "The 'renderer' directive has been deprecated and will be "
- "removed in Zope 3.5. Use the 'view' directive instead:\n"
- ' <browser:view\n'
- ' name=""\n'
- ' for="%s"\n'
- ' class="%s"\n'
- ' permission="zope.Public"\n'
- ' />' % (dottify(sourceType), dottify(factory)),
- DeprecationWarning, _context.info.file, _context.info.line)
-
- _context.action(
- discriminator = ('view', sourceType, u'', for_, 'default'),
- callable = handler,
- args = ('provideAdapter',
- (sourceType,), for_, u'', factory, 'default')
- )
Modified: zope.app.renderer/trunk/src/zope/app/renderer/plaintext.py
===================================================================
--- zope.app.renderer/trunk/src/zope/app/renderer/plaintext.py 2009-01-17 12:38:09 UTC (rev 94784)
+++ zope.app.renderer/trunk/src/zope/app/renderer/plaintext.py 2009-01-17 12:54:26 UTC (rev 94785)
@@ -19,8 +19,10 @@
import cgi
+from zope.component import adapts
from zope.interface import implements
from zope.publisher.browser import BrowserView
+from zope.publisher.interfaces.browser import IBrowserRequest
from zope.app.renderer.i18n import ZopeMessageFactory as _
from zope.app.renderer.interfaces import ISource, IHTMLRenderer
@@ -47,7 +49,7 @@
u'I hear that 1 > 2.<br />\n'
"""
implements(IHTMLRenderer)
- __used_for__ = IPlainTextSource
+ adapts(IPlainTextSource, IBrowserRequest)
def render(self):
"See zope.app.interfaces.renderer.IHTMLRenderer"
Deleted: zope.app.renderer/trunk/src/zope/app/renderer/renderer-configure.zcml
===================================================================
--- zope.app.renderer/trunk/src/zope/app/renderer/renderer-configure.zcml 2009-01-17 12:38:09 UTC (rev 94784)
+++ zope.app.renderer/trunk/src/zope/app/renderer/renderer-configure.zcml 2009-01-17 12:54:26 UTC (rev 94785)
@@ -1 +0,0 @@
-<include package="zope.app.renderer"/>
Deleted: zope.app.renderer/trunk/src/zope/app/renderer/renderer-meta.zcml
===================================================================
--- zope.app.renderer/trunk/src/zope/app/renderer/renderer-meta.zcml 2009-01-17 12:38:09 UTC (rev 94784)
+++ zope.app.renderer/trunk/src/zope/app/renderer/renderer-meta.zcml 2009-01-17 12:54:26 UTC (rev 94785)
@@ -1 +0,0 @@
-<include package="zope.app.renderer" file="meta.zcml"/>
Modified: zope.app.renderer/trunk/src/zope/app/renderer/rest.py
===================================================================
--- zope.app.renderer/trunk/src/zope/app/renderer/rest.py 2009-01-17 12:38:09 UTC (rev 94784)
+++ zope.app.renderer/trunk/src/zope/app/renderer/rest.py 2009-01-17 12:54:26 UTC (rev 94785)
@@ -19,8 +19,10 @@
import docutils.core
+from zope.component import adapts
from zope.interface import implements
from zope.publisher.browser import BrowserView
+from zope.publisher.interfaces.browser import IBrowserRequest
from zope.app.renderer.i18n import ZopeMessageFactory as _
from zope.app.renderer.interfaces import ISource, IHTMLRenderer
@@ -61,7 +63,7 @@
implements(IHTMLRenderer)
- __used_for__ = IReStructuredTextSource
+ adapts(IReStructuredTextSource, IBrowserRequest)
def render(self, settings_overrides={}):
"""See zope.app.interfaces.renderer.IHTMLRenderer
Modified: zope.app.renderer/trunk/src/zope/app/renderer/stx.py
===================================================================
--- zope.app.renderer/trunk/src/zope/app/renderer/stx.py 2009-01-17 12:38:09 UTC (rev 94784)
+++ zope.app.renderer/trunk/src/zope/app/renderer/stx.py 2009-01-17 12:54:26 UTC (rev 94785)
@@ -19,10 +19,12 @@
import re
+from zope.component import adapts
from zope.interface import implements
from zope.structuredtext.document import Document
from zope.structuredtext.html import HTML
from zope.publisher.browser import BrowserView
+from zope.publisher.interfaces.browser import IBrowserRequest
from zope.app.renderer.i18n import ZopeMessageFactory as _
from zope.app.renderer.interfaces import ISource, IHTMLRenderer
@@ -58,7 +60,7 @@
u'<p>This is \xc3\x9c.</p>\n'
"""
implements(IHTMLRenderer)
- __used_for__ = IStructuredTextSource
+ adapts(IStructuredTextSource, IBrowserRequest)
def render(self):
"See zope.app.interfaces.renderer.IHTMLRenderer"
More information about the Checkins
mailing list