[Zope3-checkins] SVN: Zope3/trunk/src/zope/app/ Make deprecated
packages zope.app.layers and zope.app.skins optional.
Florent Xicluna
laxyf at yahoo.fr
Fri Sep 8 06:49:40 EDT 2006
Log message for revision 70047:
Make deprecated packages zope.app.layers and zope.app.skins optional.
By the way, a zcml feature 'deprecatedlayers' is added.
(second attempt)
Changed:
U Zope3/trunk/src/zope/app/apidoc/browser/configure.zcml
U Zope3/trunk/src/zope/app/apidoc/browser/skin.py
U Zope3/trunk/src/zope/app/basicskin/__init__.py
U Zope3/trunk/src/zope/app/boston/__init__.py
U Zope3/trunk/src/zope/app/boston/configure.zcml
U Zope3/trunk/src/zope/app/css/__init__.py
U Zope3/trunk/src/zope/app/css/configure.zcml
U Zope3/trunk/src/zope/app/debugskin/__init__.py
U Zope3/trunk/src/zope/app/debugskin/configure.zcml
A Zope3/trunk/src/zope/app/layers/SETUP.cfg
A Zope3/trunk/src/zope/app/layers/meta.zcml
A Zope3/trunk/src/zope/app/layers/zope.app.layers-meta.zcml
U Zope3/trunk/src/zope/app/publisher/browser/configure.zcml
U Zope3/trunk/src/zope/app/publisher/browser/meta.zcml
U Zope3/trunk/src/zope/app/publisher/browser/metaconfigure.py
U Zope3/trunk/src/zope/app/rotterdam/__init__.py
U Zope3/trunk/src/zope/app/rotterdam/configure.zcml
U Zope3/trunk/src/zope/app/tree/browser/__init__.py
U Zope3/trunk/src/zope/app/tree/browser/configure.zcml
U Zope3/trunk/src/zope/app/zopetop/__init__.py
-=-
Modified: Zope3/trunk/src/zope/app/apidoc/browser/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/browser/configure.zcml 2006-09-08 10:01:50 UTC (rev 70046)
+++ Zope3/trunk/src/zope/app/apidoc/browser/configure.zcml 2006-09-08 10:49:39 UTC (rev 70047)
@@ -1,14 +1,18 @@
<configure
- xmlns="http://namespaces.zope.org/browser"
- xmlns:zope="http://namespaces.zope.org/zope"
- i18n_domain="zope">
+ xmlns="http://namespaces.zope.org/browser"
+ xmlns:zope="http://namespaces.zope.org/zope"
+ i18n_domain="zope">
<!-- BBB 2006/02/18, to be removed after 12 months -->
- <layer
- name="apidoc"
- interface=".skin.apidoc"
- bbb_aware="true"
- />
+ <configure
+ xmlns:zcml="http://namespaces.zope.org/zcml"
+ zcml:condition="have deprecatedlayers">
+ <layer
+ name="apidoc"
+ interface=".skin.apidoc"
+ bbb_aware="true"
+ />
+ </configure>
<zope:interface
interface=".skin.APIDOC"
@@ -70,52 +74,52 @@
/>
<pages
- for="zope.app.apidoc.apidoc.APIDocumentation"
- class=".apidoc.APIDocumentationView"
- permission="zope.app.apidoc.UseAPIDoc"
- layer=".skin.apidoc">
+ for="zope.app.apidoc.apidoc.APIDocumentation"
+ class=".apidoc.APIDocumentationView"
+ permission="zope.app.apidoc.UseAPIDoc"
+ layer=".skin.apidoc">
<page
name="index.html"
template="index.pt" />
<page
- name="modulelist.html"
- template="modules.pt" />
+ name="modulelist.html"
+ template="modules.pt" />
<page
- name="menu.html"
- template="menu.pt" />
+ name="menu.html"
+ template="menu.pt" />
<page
- name="contents.html"
- template="contents.pt" />
+ name="contents.html"
+ template="contents.pt" />
</pages>
<!-- Static apidoc -->
<pages
- for="zope.app.apidoc.apidoc.APIDocumentation"
- class=".apidoc.APIDocumentationView"
- permission="zope.app.apidoc.UseAPIDoc"
- layer=".skin.apidoc">
+ for="zope.app.apidoc.apidoc.APIDocumentation"
+ class=".apidoc.APIDocumentationView"
+ permission="zope.app.apidoc.UseAPIDoc"
+ layer=".skin.apidoc">
<page
name="static.html"
template="static_index.pt" />
<page
- name="staticmodulelist.html"
- template="static_modules.pt" />
+ name="staticmodulelist.html"
+ template="static_modules.pt" />
<page
- name="staticmenu.html"
- template="static_menu.pt" />
+ name="staticmenu.html"
+ template="static_menu.pt" />
<page
- name="staticcontents.html"
- template="static_contents.pt" />
+ name="staticcontents.html"
+ template="static_contents.pt" />
</pages>
@@ -158,4 +162,3 @@
/>
</configure>
-
Modified: Zope3/trunk/src/zope/app/apidoc/browser/skin.py
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/browser/skin.py 2006-09-08 10:01:50 UTC (rev 70046)
+++ Zope3/trunk/src/zope/app/apidoc/browser/skin.py 2006-09-08 10:49:39 UTC (rev 70047)
@@ -27,5 +27,8 @@
"""The `APIDOC` skin."""
# BBB 2006/02/18, to be removed after 12 months
-import zope.app.skins
-zope.app.skins.set('APIDOC', APIDOC)
+try:
+ import zope.app.skins
+ zope.app.skins.set('APIDOC', APIDOC)
+except ImportError:
+ pass
Modified: Zope3/trunk/src/zope/app/basicskin/__init__.py
===================================================================
--- Zope3/trunk/src/zope/app/basicskin/__init__.py 2006-09-08 10:01:50 UTC (rev 70046)
+++ Zope3/trunk/src/zope/app/basicskin/__init__.py 2006-09-08 10:49:39 UTC (rev 70047)
@@ -23,5 +23,8 @@
nothing else"""
# BBB 2006/02/18, to be removed after 12 months
-import zope.app.skins
-zope.app.skins.set('Basic', IBasicSkin)
+try:
+ import zope.app.skins
+ zope.app.skins.set('Basic', IBasicSkin)
+except ImportError:
+ pass
Modified: Zope3/trunk/src/zope/app/boston/__init__.py
===================================================================
--- Zope3/trunk/src/zope/app/boston/__init__.py 2006-09-08 10:01:50 UTC (rev 70046)
+++ Zope3/trunk/src/zope/app/boston/__init__.py 2006-09-08 10:49:39 UTC (rev 70047)
@@ -34,8 +34,11 @@
"""
# BBB 2006/02/18, to be removed after 12 months
-import zope.app.skins
-zope.app.skins.set('Boston', Boston)
+try:
+ import zope.app.skins
+ zope.app.skins.set('Boston', Boston)
+except ImportError:
+ pass
class IHead(IViewletManager):
"""Head viewlet manager."""
Modified: Zope3/trunk/src/zope/app/boston/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/boston/configure.zcml 2006-09-08 10:01:50 UTC (rev 70046)
+++ Zope3/trunk/src/zope/app/boston/configure.zcml 2006-09-08 10:49:39 UTC (rev 70047)
@@ -6,11 +6,13 @@
i18n_domain="zope">
<!-- BBB 2006/02/18, to be removed after 12 months -->
- <layer
- name="boston"
- interface="zope.app.boston.boston"
- bbb_aware="true"
- />
+ <configure zcml:condition="have deprecatedlayers">
+ <layer
+ name="boston"
+ interface="zope.app.boston.boston"
+ bbb_aware="true"
+ />
+ </configure>
<zope:interface
interface="zope.app.boston.Boston"
Modified: Zope3/trunk/src/zope/app/css/__init__.py
===================================================================
--- Zope3/trunk/src/zope/app/css/__init__.py 2006-09-08 10:01:50 UTC (rev 70046)
+++ Zope3/trunk/src/zope/app/css/__init__.py 2006-09-08 10:49:39 UTC (rev 70047)
@@ -31,5 +31,8 @@
"""
# BBB 2006/02/18, to be removed after 12 months
-import zope.app.skins
-zope.app.skins.set('CSS', CSS)
+try:
+ import zope.app.skins
+ zope.app.skins.set('CSS', CSS)
+except ImportError:
+ pass
Modified: Zope3/trunk/src/zope/app/css/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/css/configure.zcml 2006-09-08 10:01:50 UTC (rev 70046)
+++ Zope3/trunk/src/zope/app/css/configure.zcml 2006-09-08 10:49:39 UTC (rev 70047)
@@ -3,24 +3,28 @@
xmlns:browser="http://namespaces.zope.org/browser">
<!-- BBB 2006/02/18, to be removed after 12 months -->
- <browser:layer
- name="css"
- interface="zope.app.css.layer"
- bbb_aware="true"
- />
+ <configure
+ xmlns:zcml="http://namespaces.zope.org/zcml"
+ zcml:condition="have deprecatedlayers">
+ <browser:layer
+ name="css"
+ interface="zope.app.css.layer"
+ bbb_aware="true"
+ />
+ </configure>
<interface
interface="zope.app.css.CSS"
type="zope.publisher.interfaces.browser.IBrowserSkinType"
name="CSS"
/>
-
- <browser:resource
+
+ <browser:resource
name="zope3.css"
file="zope3.css"
layer="zope.app.css.layer" />
-
- <browser:resource
+
+ <browser:resource
name="skin.css"
file="skin.css"
layer="zope.app.css.layer" />
Modified: Zope3/trunk/src/zope/app/debugskin/__init__.py
===================================================================
--- Zope3/trunk/src/zope/app/debugskin/__init__.py 2006-09-08 10:01:50 UTC (rev 70046)
+++ Zope3/trunk/src/zope/app/debugskin/__init__.py 2006-09-08 10:49:39 UTC (rev 70047)
@@ -26,5 +26,8 @@
"""Rotterdam-based skin with debug functionality"""
# BBB 2006/02/18, to be removed after 12 months
-import zope.app.skins
-zope.app.skins.set('Debug', IDebugSkin)
+try:
+ import zope.app.skins
+ zope.app.skins.set('Debug', IDebugSkin)
+except ImportError:
+ pass
Modified: Zope3/trunk/src/zope/app/debugskin/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/debugskin/configure.zcml 2006-09-08 10:01:50 UTC (rev 70046)
+++ Zope3/trunk/src/zope/app/debugskin/configure.zcml 2006-09-08 10:49:39 UTC (rev 70047)
@@ -4,11 +4,15 @@
>
<!-- BBB 2006/02/18, to be removed after 12 months -->
- <layer
- interface=".IDebugLayer"
- name="debug"
- bbb_aware="true"
- />
+ <configure
+ xmlns:zcml="http://namespaces.zope.org/zcml"
+ zcml:condition="have deprecatedlayers">
+ <layer
+ interface=".IDebugLayer"
+ name="debug"
+ bbb_aware="true"
+ />
+ </configure>
<zope:interface
interface=".IDebugSkin"
Copied: Zope3/trunk/src/zope/app/layers/SETUP.cfg (from rev 70042, Zope3/trunk/src/zope/app/layers/SETUP.cfg)
Copied: Zope3/trunk/src/zope/app/layers/meta.zcml (from rev 70042, Zope3/trunk/src/zope/app/layers/meta.zcml)
Copied: Zope3/trunk/src/zope/app/layers/zope.app.layers-meta.zcml (from rev 70042, Zope3/trunk/src/zope/app/layers/zope.app.layers-meta.zcml)
Modified: Zope3/trunk/src/zope/app/publisher/browser/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/publisher/browser/configure.zcml 2006-09-08 10:01:50 UTC (rev 70046)
+++ Zope3/trunk/src/zope/app/publisher/browser/configure.zcml 2006-09-08 10:49:39 UTC (rev 70047)
@@ -11,11 +11,15 @@
/>
<!-- BBB 2006/02/18, to be removed after 12 months -->
-<browser:layer
- name="default"
- interface="zope.publisher.interfaces.browser.IDefaultBrowserLayer"
- bbb_aware="true"
- />
+<configure
+ xmlns:zcml="http://namespaces.zope.org/zcml"
+ zcml:condition="have deprecatedlayers">
+ <browser:layer
+ name="default"
+ interface="zope.publisher.interfaces.browser.IDefaultBrowserLayer"
+ bbb_aware="true"
+ />
+</configure>
<class class="zope.publisher.browser.BrowserRequest">
<allow
Modified: Zope3/trunk/src/zope/app/publisher/browser/meta.zcml
===================================================================
--- Zope3/trunk/src/zope/app/publisher/browser/meta.zcml 2006-09-08 10:01:50 UTC (rev 70046)
+++ Zope3/trunk/src/zope/app/publisher/browser/meta.zcml 2006-09-08 10:49:39 UTC (rev 70047)
@@ -1,6 +1,7 @@
<configure
xmlns="http://namespaces.zope.org/zope"
- xmlns:meta="http://namespaces.zope.org/meta">
+ xmlns:meta="http://namespaces.zope.org/meta"
+ xmlns:zcml="http://namespaces.zope.org/zcml">
<meta:directives namespace="http://namespaces.zope.org/browser">
@@ -129,6 +130,7 @@
<!-- BBB 2006/02/18, to be removed after 12 months -->
<meta:directive
+ zcml:condition="have deprecatedlayers"
name="layer"
schema=".metadirectives.ILayerDirective"
handler=".metaconfigure.layer"
@@ -136,6 +138,7 @@
<!-- BBB 2006/02/18, to be removed after 12 months -->
<meta:directive
+ zcml:condition="have deprecatedlayers"
name="skin"
schema=".metadirectives.ISkinDirective"
handler=".metaconfigure.skin"
Modified: Zope3/trunk/src/zope/app/publisher/browser/metaconfigure.py
===================================================================
--- Zope3/trunk/src/zope/app/publisher/browser/metaconfigure.py 2006-09-08 10:01:50 UTC (rev 70046)
+++ Zope3/trunk/src/zope/app/publisher/browser/metaconfigure.py 2006-09-08 10:49:39 UTC (rev 70047)
@@ -25,7 +25,7 @@
from zope.publisher.interfaces.browser import IBrowserRequest, IDefaultSkin
from zope.publisher.interfaces.browser import IBrowserSkinType
-from zope.app import zapi, layers, skins
+from zope.app import zapi
# referred to through ZCML
from zope.app.publisher.browser.resourcemeta import resource
@@ -142,6 +142,7 @@
>>> warnings.showwarning = showwarning
"""
+ from zope.app import layers
if name is not None and ',' in name:
raise TypeError("Commas are not allowed in layer names.")
if name is None and interface is None:
@@ -286,6 +287,7 @@
Enabling the warnings again:
>>> warnings.showwarning = showwarning
"""
+ from zope.app import skins
if name is None and interface is None:
raise ConfigurationError(
"You must specify the 'name' or 'interface' attribute.")
Modified: Zope3/trunk/src/zope/app/rotterdam/__init__.py
===================================================================
--- Zope3/trunk/src/zope/app/rotterdam/__init__.py 2006-09-08 10:01:50 UTC (rev 70046)
+++ Zope3/trunk/src/zope/app/rotterdam/__init__.py 2006-09-08 10:49:39 UTC (rev 70047)
@@ -29,5 +29,8 @@
"""
# BBB 2006/02/18, to be removed after 12 months
-import zope.app.skins
-zope.app.skins.set('Rotterdam', Rotterdam)
+try:
+ import zope.app.skins
+ zope.app.skins.set('Rotterdam', Rotterdam)
+except ImportError:
+ pass
Modified: Zope3/trunk/src/zope/app/rotterdam/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/rotterdam/configure.zcml 2006-09-08 10:01:50 UTC (rev 70046)
+++ Zope3/trunk/src/zope/app/rotterdam/configure.zcml 2006-09-08 10:49:39 UTC (rev 70047)
@@ -3,11 +3,15 @@
xmlns:browser="http://namespaces.zope.org/browser">
<!-- BBB 2006/02/18, to be removed after 12 months -->
- <browser:layer
- name="rotterdam"
- interface="zope.app.rotterdam.rotterdam"
- bbb_aware="true"
- />
+ <configure
+ xmlns:zcml="http://namespaces.zope.org/zcml"
+ zcml:condition="have deprecatedlayers">
+ <browser:layer
+ name="rotterdam"
+ interface="zope.app.rotterdam.rotterdam"
+ bbb_aware="true"
+ />
+ </configure>
<interface
interface="zope.app.rotterdam.Rotterdam"
Modified: Zope3/trunk/src/zope/app/tree/browser/__init__.py
===================================================================
--- Zope3/trunk/src/zope/app/tree/browser/__init__.py 2006-09-08 10:01:50 UTC (rev 70046)
+++ Zope3/trunk/src/zope/app/tree/browser/__init__.py 2006-09-08 10:49:39 UTC (rev 70047)
@@ -33,8 +33,11 @@
navigation macro."""
# BBB 2006/02/18, to be removed after 12 months
-import zope.app.skins
-zope.app.skins.set('StaticTree', IStaticTreeSkin)
+try:
+ import zope.app.skins
+ zope.app.skins.set('StaticTree', IStaticTreeSkin)
+except ImportError:
+ pass
class StatefulTreeView(BrowserView):
Modified: Zope3/trunk/src/zope/app/tree/browser/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/tree/browser/configure.zcml 2006-09-08 10:01:50 UTC (rev 70046)
+++ Zope3/trunk/src/zope/app/tree/browser/configure.zcml 2006-09-08 10:49:39 UTC (rev 70047)
@@ -42,11 +42,15 @@
<!-- Set up the 'StaticTree' skin -->
<!-- BBB 2006/02/18, to be removed after 12 months -->
- <browser:layer
- interface=".IStaticTreeLayer"
- name="statictree"
- bbb_aware="true"
- />
+ <configure
+ xmlns:zcml="http://namespaces.zope.org/zcml"
+ zcml:condition="have deprecatedlayers">
+ <browser:layer
+ interface=".IStaticTreeLayer"
+ name="statictree"
+ bbb_aware="true"
+ />
+ </configure>
<interface
interface=".IStaticTreeSkin"
Modified: Zope3/trunk/src/zope/app/zopetop/__init__.py
===================================================================
--- Zope3/trunk/src/zope/app/zopetop/__init__.py 2006-09-08 10:01:50 UTC (rev 70046)
+++ Zope3/trunk/src/zope/app/zopetop/__init__.py 2006-09-08 10:49:39 UTC (rev 70047)
@@ -37,5 +37,8 @@
"""
# BBB 2006/02/18, to be removed after 12 months
-import zope.app.skins
-zope.app.skins.set('ZopeTop', ZopeTop)
+try:
+ import zope.app.skins
+ zope.app.skins.set('ZopeTop', ZopeTop)
+except ImportError:
+ pass
More information about the Zope3-Checkins
mailing list