[Zope3-checkins] SVN: Zope3/trunk/src/zope/app/ Revert changes from
revision 70042.
Florent Xicluna
laxyf at yahoo.fr
Fri Sep 8 06:01:12 EDT 2006
Log message for revision 70045:
Revert changes from revision 70042.
Oups... insufficient tests...
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
D Zope3/trunk/src/zope/app/layers/SETUP.cfg
D Zope3/trunk/src/zope/app/layers/meta.zcml
D 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 09:44:52 UTC (rev 70044)
+++ Zope3/trunk/src/zope/app/apidoc/browser/configure.zcml 2006-09-08 10:01:11 UTC (rev 70045)
@@ -1,12 +1,10 @@
<configure
- xmlns="http://namespaces.zope.org/browser"
- xmlns:zope="http://namespaces.zope.org/zope"
- xmlns:zcml="http://namespaces.zope.org/zcml"
- 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
- zcml:condition="have deprecatedlayers"
name="apidoc"
interface=".skin.apidoc"
bbb_aware="true"
@@ -72,52 +70,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>
@@ -160,3 +158,4 @@
/>
</configure>
+
Modified: Zope3/trunk/src/zope/app/apidoc/browser/skin.py
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/browser/skin.py 2006-09-08 09:44:52 UTC (rev 70044)
+++ Zope3/trunk/src/zope/app/apidoc/browser/skin.py 2006-09-08 10:01:11 UTC (rev 70045)
@@ -27,8 +27,5 @@
"""The `APIDOC` skin."""
# BBB 2006/02/18, to be removed after 12 months
-try:
- import zope.app.skins
- zope.app.skins.set('APIDOC', APIDOC)
-except ImportError:
- pass
+import zope.app.skins
+zope.app.skins.set('APIDOC', APIDOC)
Modified: Zope3/trunk/src/zope/app/basicskin/__init__.py
===================================================================
--- Zope3/trunk/src/zope/app/basicskin/__init__.py 2006-09-08 09:44:52 UTC (rev 70044)
+++ Zope3/trunk/src/zope/app/basicskin/__init__.py 2006-09-08 10:01:11 UTC (rev 70045)
@@ -23,8 +23,5 @@
nothing else"""
# BBB 2006/02/18, to be removed after 12 months
-try:
- import zope.app.skins
- zope.app.skins.set('Basic', IBasicSkin)
-except ImportError:
- pass
+import zope.app.skins
+zope.app.skins.set('Basic', IBasicSkin)
Modified: Zope3/trunk/src/zope/app/boston/__init__.py
===================================================================
--- Zope3/trunk/src/zope/app/boston/__init__.py 2006-09-08 09:44:52 UTC (rev 70044)
+++ Zope3/trunk/src/zope/app/boston/__init__.py 2006-09-08 10:01:11 UTC (rev 70045)
@@ -34,11 +34,8 @@
"""
# BBB 2006/02/18, to be removed after 12 months
-try:
- import zope.app.skins
- zope.app.skins.set('Boston', Boston)
-except ImportError:
- pass
+import zope.app.skins
+zope.app.skins.set('Boston', Boston)
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 09:44:52 UTC (rev 70044)
+++ Zope3/trunk/src/zope/app/boston/configure.zcml 2006-09-08 10:01:11 UTC (rev 70045)
@@ -7,7 +7,6 @@
<!-- BBB 2006/02/18, to be removed after 12 months -->
<layer
- zcml:condition="have deprecatedlayers"
name="boston"
interface="zope.app.boston.boston"
bbb_aware="true"
Modified: Zope3/trunk/src/zope/app/css/__init__.py
===================================================================
--- Zope3/trunk/src/zope/app/css/__init__.py 2006-09-08 09:44:52 UTC (rev 70044)
+++ Zope3/trunk/src/zope/app/css/__init__.py 2006-09-08 10:01:11 UTC (rev 70045)
@@ -31,8 +31,5 @@
"""
# BBB 2006/02/18, to be removed after 12 months
-try:
- import zope.app.skins
- zope.app.skins.set('CSS', CSS)
-except ImportError:
- pass
+import zope.app.skins
+zope.app.skins.set('CSS', CSS)
Modified: Zope3/trunk/src/zope/app/css/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/css/configure.zcml 2006-09-08 09:44:52 UTC (rev 70044)
+++ Zope3/trunk/src/zope/app/css/configure.zcml 2006-09-08 10:01:11 UTC (rev 70045)
@@ -1,12 +1,9 @@
<configure
xmlns="http://namespaces.zope.org/zope"
- xmlns:browser="http://namespaces.zope.org/browser"
- xmlns:zope="http://namespaces.zope.org/zope"
- xmlns:zcml="http://namespaces.zope.org/zcml">
+ xmlns:browser="http://namespaces.zope.org/browser">
<!-- BBB 2006/02/18, to be removed after 12 months -->
- <browser:layer
- zcml:condition="have deprecatedlayers"
+ <browser:layer
name="css"
interface="zope.app.css.layer"
bbb_aware="true"
@@ -17,13 +14,13 @@
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 09:44:52 UTC (rev 70044)
+++ Zope3/trunk/src/zope/app/debugskin/__init__.py 2006-09-08 10:01:11 UTC (rev 70045)
@@ -26,8 +26,5 @@
"""Rotterdam-based skin with debug functionality"""
# BBB 2006/02/18, to be removed after 12 months
-try:
- import zope.app.skins
- zope.app.skins.set('Debug', IDebugSkin)
-except ImportError:
- pass
+import zope.app.skins
+zope.app.skins.set('Debug', IDebugSkin)
Modified: Zope3/trunk/src/zope/app/debugskin/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/debugskin/configure.zcml 2006-09-08 09:44:52 UTC (rev 70044)
+++ Zope3/trunk/src/zope/app/debugskin/configure.zcml 2006-09-08 10:01:11 UTC (rev 70045)
@@ -1,12 +1,10 @@
<configure
xmlns="http://namespaces.zope.org/browser"
xmlns:zope="http://namespaces.zope.org/zope"
- xmlns:zcml="http://namespaces.zope.org/zcml"
>
<!-- BBB 2006/02/18, to be removed after 12 months -->
<layer
- zcml:condition="have deprecatedlayers"
interface=".IDebugLayer"
name="debug"
bbb_aware="true"
Deleted: Zope3/trunk/src/zope/app/layers/SETUP.cfg
===================================================================
--- Zope3/trunk/src/zope/app/layers/SETUP.cfg 2006-09-08 09:44:52 UTC (rev 70044)
+++ Zope3/trunk/src/zope/app/layers/SETUP.cfg 2006-09-08 10:01:11 UTC (rev 70045)
@@ -1,5 +0,0 @@
-# Tell zpkg how to install the ZCML slugs.
-
-<data-files zopeskel/etc/package-includes>
- zope.app.layers-*.zcml
-</data-files>
Deleted: Zope3/trunk/src/zope/app/layers/meta.zcml
===================================================================
--- Zope3/trunk/src/zope/app/layers/meta.zcml 2006-09-08 09:44:52 UTC (rev 70044)
+++ Zope3/trunk/src/zope/app/layers/meta.zcml 2006-09-08 10:01:11 UTC (rev 70045)
@@ -1,3 +0,0 @@
-<configure xmlns:meta="http://namespaces.zope.org/meta">
- <meta:provides feature="deprecatedlayers" />
-</configure>
Deleted: Zope3/trunk/src/zope/app/layers/zope.app.layers-meta.zcml
===================================================================
--- Zope3/trunk/src/zope/app/layers/zope.app.layers-meta.zcml 2006-09-08 09:44:52 UTC (rev 70044)
+++ Zope3/trunk/src/zope/app/layers/zope.app.layers-meta.zcml 2006-09-08 10:01:11 UTC (rev 70045)
@@ -1 +0,0 @@
-<include package="zope.app.layers" file="meta.zcml" />
Modified: Zope3/trunk/src/zope/app/publisher/browser/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/publisher/browser/configure.zcml 2006-09-08 09:44:52 UTC (rev 70044)
+++ Zope3/trunk/src/zope/app/publisher/browser/configure.zcml 2006-09-08 10:01:11 UTC (rev 70045)
@@ -1,7 +1,6 @@
<configure
xmlns="http://namespaces.zope.org/zope"
- xmlns:browser="http://namespaces.zope.org/browser"
- xmlns:zcml="http://namespaces.zope.org/zcml">
+ xmlns:browser="http://namespaces.zope.org/browser">
<interface
interface="zope.app.publisher.interfaces.browser.IMenuItemType" />
@@ -13,7 +12,6 @@
<!-- BBB 2006/02/18, to be removed after 12 months -->
<browser:layer
- zcml:condition="have deprecatedlayers"
name="default"
interface="zope.publisher.interfaces.browser.IDefaultBrowserLayer"
bbb_aware="true"
Modified: Zope3/trunk/src/zope/app/publisher/browser/meta.zcml
===================================================================
--- Zope3/trunk/src/zope/app/publisher/browser/meta.zcml 2006-09-08 09:44:52 UTC (rev 70044)
+++ Zope3/trunk/src/zope/app/publisher/browser/meta.zcml 2006-09-08 10:01:11 UTC (rev 70045)
@@ -1,7 +1,6 @@
<configure
xmlns="http://namespaces.zope.org/zope"
- xmlns:meta="http://namespaces.zope.org/meta"
- xmlns:zcml="http://namespaces.zope.org/zcml">
+ xmlns:meta="http://namespaces.zope.org/meta">
<meta:directives namespace="http://namespaces.zope.org/browser">
@@ -130,7 +129,6 @@
<!-- BBB 2006/02/18, to be removed after 12 months -->
<meta:directive
- zcml:condition="have deprecatedlayers"
name="layer"
schema=".metadirectives.ILayerDirective"
handler=".metaconfigure.layer"
@@ -138,7 +136,6 @@
<!-- 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 09:44:52 UTC (rev 70044)
+++ Zope3/trunk/src/zope/app/publisher/browser/metaconfigure.py 2006-09-08 10:01:11 UTC (rev 70045)
@@ -25,7 +25,7 @@
from zope.publisher.interfaces.browser import IBrowserRequest, IDefaultSkin
from zope.publisher.interfaces.browser import IBrowserSkinType
-from zope.app import zapi
+from zope.app import zapi, layers, skins
# referred to through ZCML
from zope.app.publisher.browser.resourcemeta import resource
@@ -142,7 +142,6 @@
>>> 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:
@@ -287,7 +286,6 @@
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 09:44:52 UTC (rev 70044)
+++ Zope3/trunk/src/zope/app/rotterdam/__init__.py 2006-09-08 10:01:11 UTC (rev 70045)
@@ -29,8 +29,5 @@
"""
# BBB 2006/02/18, to be removed after 12 months
-try:
- import zope.app.skins
- zope.app.skins.set('Rotterdam', Rotterdam)
-except ImportError:
- pass
+import zope.app.skins
+zope.app.skins.set('Rotterdam', Rotterdam)
Modified: Zope3/trunk/src/zope/app/rotterdam/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/rotterdam/configure.zcml 2006-09-08 09:44:52 UTC (rev 70044)
+++ Zope3/trunk/src/zope/app/rotterdam/configure.zcml 2006-09-08 10:01:11 UTC (rev 70045)
@@ -1,11 +1,9 @@
<configure
xmlns="http://namespaces.zope.org/zope"
- xmlns:browser="http://namespaces.zope.org/browser"
- xmlns:zcml="http://namespaces.zope.org/zcml">
+ xmlns:browser="http://namespaces.zope.org/browser">
<!-- BBB 2006/02/18, to be removed after 12 months -->
<browser:layer
- zcml:condition="have deprecatedlayers"
name="rotterdam"
interface="zope.app.rotterdam.rotterdam"
bbb_aware="true"
Modified: Zope3/trunk/src/zope/app/tree/browser/__init__.py
===================================================================
--- Zope3/trunk/src/zope/app/tree/browser/__init__.py 2006-09-08 09:44:52 UTC (rev 70044)
+++ Zope3/trunk/src/zope/app/tree/browser/__init__.py 2006-09-08 10:01:11 UTC (rev 70045)
@@ -33,11 +33,8 @@
navigation macro."""
# BBB 2006/02/18, to be removed after 12 months
-try:
- import zope.app.skins
- zope.app.skins.set('StaticTree', IStaticTreeSkin)
-except ImportError:
- pass
+import zope.app.skins
+zope.app.skins.set('StaticTree', IStaticTreeSkin)
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 09:44:52 UTC (rev 70044)
+++ Zope3/trunk/src/zope/app/tree/browser/configure.zcml 2006-09-08 10:01:11 UTC (rev 70045)
@@ -1,7 +1,6 @@
<configure
xmlns="http://namespaces.zope.org/zope"
xmlns:browser="http://namespaces.zope.org/browser"
- xmlns:zcml="http://namespaces.zope.org/zcml"
i18n_domain="zope"
>
@@ -44,7 +43,6 @@
<!-- BBB 2006/02/18, to be removed after 12 months -->
<browser:layer
- zcml:condition="have deprecatedlayers"
interface=".IStaticTreeLayer"
name="statictree"
bbb_aware="true"
Modified: Zope3/trunk/src/zope/app/zopetop/__init__.py
===================================================================
--- Zope3/trunk/src/zope/app/zopetop/__init__.py 2006-09-08 09:44:52 UTC (rev 70044)
+++ Zope3/trunk/src/zope/app/zopetop/__init__.py 2006-09-08 10:01:11 UTC (rev 70045)
@@ -37,8 +37,5 @@
"""
# BBB 2006/02/18, to be removed after 12 months
-try:
- import zope.app.skins
- zope.app.skins.set('ZopeTop', ZopeTop)
-except ImportError:
- pass
+import zope.app.skins
+zope.app.skins.set('ZopeTop', ZopeTop)
More information about the Zope3-Checkins
mailing list