[Checkins] SVN: z3c.layer/trunk/ - Replaced ``zope.app.zapi`` by the original imports.
Michael Howitz
mh at gocept.com
Sat Feb 7 09:48:38 EST 2009
Log message for revision 96206:
- Replaced ``zope.app.zapi`` by the original imports.
- Replaced ``zope.app.container`` by ``zope.container``.
- Fixed deprecation warning about importing ``ISite`` from
``zope.app.component.interfaces``.
- Declared ``zope.app.zcmlfiles`` as testing dependency, as otherwise
tests break.
Changed:
U z3c.layer/trunk/CHANGES.txt
U z3c.layer/trunk/setup.py
U z3c.layer/trunk/src/z3c/layer/minimal/zope.app.publisher.browser.zcml
U z3c.layer/trunk/src/z3c/layer/minimal/zope.traversing.browser.zcml
U z3c.layer/trunk/src/z3c/layer/pagelet/browser/__init__.py
U z3c.layer/trunk/src/z3c/layer/pagelet/zope.app.publisher.browser.zcml
U z3c.layer/trunk/src/z3c/layer/pagelet/zope.traversing.browser.zcml
U z3c.layer/trunk/src/z3c/layer/trusted/zope.traversing.browser.zcml
-=-
Modified: z3c.layer/trunk/CHANGES.txt
===================================================================
--- z3c.layer/trunk/CHANGES.txt 2009-02-07 13:40:36 UTC (rev 96205)
+++ z3c.layer/trunk/CHANGES.txt 2009-02-07 14:48:38 UTC (rev 96206)
@@ -2,6 +2,20 @@
CHANGES
=======
+0.2.4 (unreleased)
+------------------
+
+- Replaced ``zope.app.zapi`` by the original imports.
+
+- Replaced ``zope.app.container`` by ``zope.container``.
+
+- Fixed deprecation warning about importing ``ISite`` from
+ ``zope.app.component.interfaces``.
+
+- Declared ``zope.app.zcmlfiles`` as testing dependency, as otherwise
+ tests break.
+
+
0.2.3 (2007-11-07)
------------------
Modified: z3c.layer/trunk/setup.py
===================================================================
--- z3c.layer/trunk/setup.py 2009-02-07 13:40:36 UTC (rev 96205)
+++ z3c.layer/trunk/setup.py 2009-02-07 14:48:38 UTC (rev 96206)
@@ -53,6 +53,7 @@
'zope.app.securitypolicy',
'zope.securitypolicy',
'zope.testbrowser',
+ 'zope.app.zcmlfiles',
]
),
install_requires = [
Modified: z3c.layer/trunk/src/z3c/layer/minimal/zope.app.publisher.browser.zcml
===================================================================
--- z3c.layer/trunk/src/z3c/layer/minimal/zope.app.publisher.browser.zcml 2009-02-07 13:40:36 UTC (rev 96205)
+++ z3c.layer/trunk/src/z3c/layer/minimal/zope.app.publisher.browser.zcml 2009-02-07 14:48:38 UTC (rev 96206)
@@ -3,9 +3,9 @@
xmlns:browser="http://namespaces.zope.org/browser"
i18n_domain="z3c">
- <browser:page
+ <browser:page
name=""
- for="zope.app.component.interfaces.ISite"
+ for="zope.location.interfaces.ISite"
class="zope.app.publisher.browser.resources.Resources"
permission="zope.Public"
allowed_interface="zope.publisher.interfaces.browser.IBrowserPublisher"
Modified: z3c.layer/trunk/src/z3c/layer/minimal/zope.traversing.browser.zcml
===================================================================
--- z3c.layer/trunk/src/z3c/layer/minimal/zope.traversing.browser.zcml 2009-02-07 13:40:36 UTC (rev 96205)
+++ z3c.layer/trunk/src/z3c/layer/minimal/zope.traversing.browser.zcml 2009-02-07 14:48:38 UTC (rev 96206)
@@ -13,19 +13,19 @@
/>
<adapter
- for="zope.app.container.interfaces.IItemContainer
+ for="zope.container.interfaces.IItemContainer
z3c.layer.minimal.IMinimalBrowserLayer"
provides="zope.publisher.interfaces.browser.IBrowserPublisher"
- factory="zope.app.container.traversal.ItemTraverser"
+ factory="zope.container.traversal.ItemTraverser"
permission="zope.Public"
trusted="True"
/>
<adapter
- for="zope.app.container.interfaces.ISimpleReadContainer
+ for="zope.container.interfaces.ISimpleReadContainer
z3c.layer.minimal.IMinimalBrowserLayer"
provides="zope.publisher.interfaces.browser.IBrowserPublisher"
- factory="zope.app.container.traversal.ItemTraverser"
+ factory="zope.container.traversal.ItemTraverser"
permission="zope.Public"
trusted="True"
/>
@@ -55,7 +55,7 @@
allowed_interface="zope.traversing.browser.interfaces.IAbsoluteURL"
type="z3c.layer.minimal.IMinimalBrowserLayer"
/>
-
+
<view
for="zope.traversing.interfaces.IContainmentRoot"
factory="zope.traversing.browser.SiteAbsoluteURL"
Modified: z3c.layer/trunk/src/z3c/layer/pagelet/browser/__init__.py
===================================================================
--- z3c.layer/trunk/src/z3c/layer/pagelet/browser/__init__.py 2009-02-07 13:40:36 UTC (rev 96205)
+++ z3c.layer/trunk/src/z3c/layer/pagelet/browser/__init__.py 2009-02-07 14:48:38 UTC (rev 96206)
@@ -20,11 +20,10 @@
from zope.app.exception.browser.unauthorized import Unauthorized
from zope.app.exception.browser.user import UserErrorView
from zope.app.exception.browser.notfound import NotFound
-from zope.app import zapi
from z3c.template.interfaces import IPageTemplate
from z3c.pagelet import browser
+import zope.app.security.interfaces
-
class SystemErrorPagelet(browser.BrowserPagelet, SystemErrorView):
"""SystemError pagelet."""
@@ -36,7 +35,7 @@
# Set the error status to 403 (Forbidden) in the case when we don't
# challenge the user
self.request.response.setStatus(403)
-
+
# make sure that squid does not keep the response in the cache
self.request.response.setHeader(
'Expires', 'Mon, 26 Jul 1997 05:00:00 GMT')
@@ -45,14 +44,15 @@
self.request.response.setHeader('Pragma', 'no-cache')
principal = self.request.principal
- auth = zapi.principals()
+ auth = zope.component.getUtility(
+ zope.app.security.interfaces.IAuthentication)
auth.unauthorized(principal.id, self.request)
if self.request.response.getStatus() not in (302, 303):
- template = zope.component.getMultiAdapter((self, self.request),
+ template = zope.component.getMultiAdapter((self, self.request),
IPageTemplate)
return template(self)
-
+
class UserErrorPagelet(browser.BrowserPagelet, UserErrorView):
"""UserError pagelet."""
@@ -62,6 +62,6 @@
def render(self):
self.request.response.setStatus(404)
- template = zope.component.getMultiAdapter((self, self.request),
+ template = zope.component.getMultiAdapter((self, self.request),
IPageTemplate)
return template(self)
Modified: z3c.layer/trunk/src/z3c/layer/pagelet/zope.app.publisher.browser.zcml
===================================================================
--- z3c.layer/trunk/src/z3c/layer/pagelet/zope.app.publisher.browser.zcml 2009-02-07 13:40:36 UTC (rev 96205)
+++ z3c.layer/trunk/src/z3c/layer/pagelet/zope.app.publisher.browser.zcml 2009-02-07 14:48:38 UTC (rev 96206)
@@ -3,9 +3,9 @@
xmlns:browser="http://namespaces.zope.org/browser"
i18n_domain="z3c">
- <browser:page
+ <browser:page
name=""
- for="zope.app.component.interfaces.ISite"
+ for="zope.location.interfaces.ISite"
class="zope.app.publisher.browser.resources.Resources"
permission="zope.Public"
allowed_interface="zope.publisher.interfaces.browser.IBrowserPublisher"
Modified: z3c.layer/trunk/src/z3c/layer/pagelet/zope.traversing.browser.zcml
===================================================================
--- z3c.layer/trunk/src/z3c/layer/pagelet/zope.traversing.browser.zcml 2009-02-07 13:40:36 UTC (rev 96205)
+++ z3c.layer/trunk/src/z3c/layer/pagelet/zope.traversing.browser.zcml 2009-02-07 14:48:38 UTC (rev 96206)
@@ -13,19 +13,19 @@
/>
<adapter
- for="zope.app.container.interfaces.IItemContainer
+ for="zope.container.interfaces.IItemContainer
z3c.layer.pagelet.IPageletBrowserLayer"
provides="zope.publisher.interfaces.browser.IBrowserPublisher"
- factory="zope.app.container.traversal.ItemTraverser"
+ factory="zope.container.traversal.ItemTraverser"
permission="zope.Public"
trusted="True"
/>
<adapter
- for="zope.app.container.interfaces.ISimpleReadContainer
+ for="zope.container.interfaces.ISimpleReadContainer
z3c.layer.pagelet.IPageletBrowserLayer"
provides="zope.publisher.interfaces.browser.IBrowserPublisher"
- factory="zope.app.container.traversal.ItemTraverser"
+ factory="zope.container.traversal.ItemTraverser"
permission="zope.Public"
trusted="True"
/>
@@ -55,7 +55,7 @@
allowed_interface="zope.traversing.browser.interfaces.IAbsoluteURL"
type="z3c.layer.pagelet.IPageletBrowserLayer"
/>
-
+
<view
for="zope.traversing.interfaces.IContainmentRoot"
factory="zope.traversing.browser.SiteAbsoluteURL"
Modified: z3c.layer/trunk/src/z3c/layer/trusted/zope.traversing.browser.zcml
===================================================================
--- z3c.layer/trunk/src/z3c/layer/trusted/zope.traversing.browser.zcml 2009-02-07 13:40:36 UTC (rev 96205)
+++ z3c.layer/trunk/src/z3c/layer/trusted/zope.traversing.browser.zcml 2009-02-07 14:48:38 UTC (rev 96206)
@@ -13,19 +13,19 @@
/>
<adapter
- for="zope.app.container.interfaces.IItemContainer
+ for="zope.container.interfaces.IItemContainer
z3c.layer.trusted.ITrustedBrowserLayer"
provides="zope.publisher.interfaces.browser.IBrowserPublisher"
- factory="zope.app.container.traversal.ItemTraverser"
+ factory="zope.container.traversal.ItemTraverser"
permission="zope.Public"
trusted="True"
/>
<adapter
- for="zope.app.container.interfaces.ISimpleReadContainer
+ for="zope.container.interfaces.ISimpleReadContainer
z3c.layer.trusted.ITrustedBrowserLayer"
provides="zope.publisher.interfaces.browser.IBrowserPublisher"
- factory="zope.app.container.traversal.ItemTraverser"
+ factory="zope.container.traversal.ItemTraverser"
permission="zope.Public"
trusted="True"
/>
More information about the Checkins
mailing list