[Zope-Checkins]
SVN: Products.Five/branches/regebro-traversal_refactor/
Deprecating five:defaultViewable.
Lennart Regebro
regebro at gmail.com
Thu Apr 27 08:50:10 EDT 2006
Log message for revision 67641:
Deprecating five:defaultViewable.
Changed:
U Products.Five/branches/regebro-traversal_refactor/CHANGES.txt
U Products.Five/branches/regebro-traversal_refactor/browser/configure.zcml
U Products.Five/branches/regebro-traversal_refactor/browser/tests/defaultview.zcml
U Products.Five/branches/regebro-traversal_refactor/browser/tests/test_recurse.py
U Products.Five/branches/regebro-traversal_refactor/doc/directives.txt
U Products.Five/branches/regebro-traversal_refactor/doc/products/ViewsTutorial/configure.zcml
U Products.Five/branches/regebro-traversal_refactor/fiveconfigure.py
U Products.Five/branches/regebro-traversal_refactor/tests/viewable.txt
-=-
Modified: Products.Five/branches/regebro-traversal_refactor/CHANGES.txt
===================================================================
--- Products.Five/branches/regebro-traversal_refactor/CHANGES.txt 2006-04-27 12:49:22 UTC (rev 67640)
+++ Products.Five/branches/regebro-traversal_refactor/CHANGES.txt 2006-04-27 12:50:09 UTC (rev 67641)
@@ -16,6 +16,9 @@
* fiveconfigure.py: replaced zLOG with logging module
+* five:defaultViewable and five:traversable are now unessecary, as the
+ functionality exists in the Zope core publisher from Zope 2.10 and up.
+
Five 1.4b (2006-03-31)
======================
Modified: Products.Five/branches/regebro-traversal_refactor/browser/configure.zcml
===================================================================
--- Products.Five/branches/regebro-traversal_refactor/browser/configure.zcml 2006-04-27 12:49:22 UTC (rev 67640)
+++ Products.Five/branches/regebro-traversal_refactor/browser/configure.zcml 2006-04-27 12:50:09 UTC (rev 67641)
@@ -1,7 +1,7 @@
<configure xmlns="http://namespaces.zope.org/zope"
xmlns:browser="http://namespaces.zope.org/browser">
- <browser:defaultView name="index.html" />
+ <!--browser:defaultView name="index.html" /-->
<interface
interface="zope.publisher.interfaces.browser.ILayer"
Modified: Products.Five/branches/regebro-traversal_refactor/browser/tests/defaultview.zcml
===================================================================
--- Products.Five/branches/regebro-traversal_refactor/browser/tests/defaultview.zcml 2006-04-27 12:49:22 UTC (rev 67640)
+++ Products.Five/branches/regebro-traversal_refactor/browser/tests/defaultview.zcml 2006-04-27 12:50:09 UTC (rev 67641)
@@ -2,8 +2,8 @@
xmlns:browser="http://namespaces.zope.org/browser"
xmlns:five="http://namespaces.zope.org/five">
- <five:defaultViewable
- class="Products.Five.tests.testing.simplecontent.SimpleContent" />
+ <!--five:defaultViewable
+ class="Products.Five.tests.testing.simplecontent.SimpleContent" /-->
<browser:defaultView
for="Products.Five.tests.testing.simplecontent.ISimpleContent"
@@ -21,14 +21,14 @@
<!-- this tests whether five:defaultViewable can be called on a class that
already provides __call__, such as our CallableSimpleContent -->
- <five:defaultViewable
- class="Products.Five.tests.testing.simplecontent.CallableSimpleContent" />
+ <!--five:defaultViewable
+ class="Products.Five.tests.testing.simplecontent.CallableSimpleContent" /-->
<!-- this tests whether five:defaultViewable can be called on a class that
already provides index_html, such as our IndexSimpleContent -->
- <five:defaultViewable
- class="Products.Five.tests.testing.simplecontent.IndexSimpleContent" />
+ <!--five:defaultViewable
+ class="Products.Five.tests.testing.simplecontent.IndexSimpleContent" /-->
<browser:defaultView
for="Products.Five.tests.testing.simplecontent.IIndexSimpleContent"
Modified: Products.Five/branches/regebro-traversal_refactor/browser/tests/test_recurse.py
===================================================================
--- Products.Five/branches/regebro-traversal_refactor/browser/tests/test_recurse.py 2006-04-27 12:49:22 UTC (rev 67640)
+++ Products.Five/branches/regebro-traversal_refactor/browser/tests/test_recurse.py 2006-04-27 12:50:09 UTC (rev 67641)
@@ -46,7 +46,7 @@
name for it:
>>> from Products.Five.fiveconfigure import classDefaultViewable
- >>> classDefaultViewable(Recurse)
+ >>> #classDefaultViewable(Recurse)
>>> from zope.component import provideAdapter
>>> from zope.publisher.interfaces.browser import IBrowserRequest
Modified: Products.Five/branches/regebro-traversal_refactor/doc/directives.txt
===================================================================
--- Products.Five/branches/regebro-traversal_refactor/doc/directives.txt 2006-04-27 12:49:22 UTC (rev 67640)
+++ Products.Five/branches/regebro-traversal_refactor/doc/directives.txt 2006-04-27 12:50:09 UTC (rev 67641)
@@ -137,6 +137,8 @@
traversable
-----------
+This statement is now deprecated, since the functionality now is on Zope Core.
+
Make a Zope 2 content class traversable in the Zope 3 manner using
Five. This is used to attached views, resources and other things to
Zope 2 objects.
@@ -144,6 +146,8 @@
defaultViewable
---------------
+This statement is now deprecated, since the functionality now is on Zope Core.
+
Make a Zope 2 content class use a Zope 3 default view when looking at
it without any paths appended to it. This works then instead of
``index_html`` in Zope 2.
Modified: Products.Five/branches/regebro-traversal_refactor/doc/products/ViewsTutorial/configure.zcml
===================================================================
--- Products.Five/branches/regebro-traversal_refactor/doc/products/ViewsTutorial/configure.zcml 2006-04-27 12:49:22 UTC (rev 67640)
+++ Products.Five/branches/regebro-traversal_refactor/doc/products/ViewsTutorial/configure.zcml 2006-04-27 12:50:09 UTC (rev 67641)
@@ -79,7 +79,7 @@
permission="zope2.ViewManagementScreens"
/>
- <five:defaultViewable class=".democontent.DemoContent"/>
+ <!-- five:defaultViewable class=".democontent.DemoContent"/-->
<browser:defaultView
for=".democontent.IDemoContent"
Modified: Products.Five/branches/regebro-traversal_refactor/fiveconfigure.py
===================================================================
--- Products.Five/branches/regebro-traversal_refactor/fiveconfigure.py 2006-04-27 12:49:22 UTC (rev 67640)
+++ Products.Five/branches/regebro-traversal_refactor/fiveconfigure.py 2006-04-27 12:50:09 UTC (rev 67641)
@@ -138,6 +138,9 @@
_traversable_monkies.append(class_)
def traversable(_context, class_):
+ warnings.warn("The five:traversable statement is no longer needed " \
+ "and will be removed in Zope 2.12",
+ DeprecationWarning)
_context.action(
discriminator = None,
callable = classTraversable,
@@ -145,7 +148,7 @@
)
_defaultviewable_monkies = []
-def classDefaultViewable(class_):
+def classDefaultViewable(class_):
# If a class already has this attribute, it means it is either a
# subclass of DefaultViewable or was already processed with this
# directive; in either case, do nothing... except in the case were
@@ -173,6 +176,10 @@
_defaultviewable_monkies.append(class_)
def defaultViewable(_context, class_):
+ warnings.warn("The five:defaultViewable statement is no longer needed " \
+ "and will be removed in Zope 2.12",
+ DeprecationWarning, 2)
+ return
_context.action(
discriminator = None,
callable = classDefaultViewable,
Modified: Products.Five/branches/regebro-traversal_refactor/tests/viewable.txt
===================================================================
--- Products.Five/branches/regebro-traversal_refactor/tests/viewable.txt 2006-04-27 12:49:22 UTC (rev 67640)
+++ Products.Five/branches/regebro-traversal_refactor/tests/viewable.txt 2006-04-27 12:50:09 UTC (rev 67641)
@@ -68,7 +68,7 @@
>>> from Products.Five.fiveconfigure import classDefaultViewable
>>> from OFS.Folder import Folder
- >>> classDefaultViewable(Folder)
+ >>> #classDefaultViewable(Folder)
And try it again:
More information about the Zope-Checkins
mailing list