[Checkins] SVN: z3c.layer.pagelet/trunk/ - Using ``zope.location.interfaces.ISite`` instead of
Michael Howitz
mh at gocept.com
Sat Feb 14 08:43:36 EST 2009
Log message for revision 96523:
- Using ``zope.location.interfaces.ISite`` instead of
``zope.app.component.interfaces.ISite``.
- Using ``zope.container`` instead of ``zope.app.container``.
- Cleaned up dependencies.
Changed:
U z3c.layer.pagelet/trunk/CHANGES.txt
U z3c.layer.pagelet/trunk/buildout.cfg
U z3c.layer.pagelet/trunk/setup.py
U z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/browser/__init__.py
U z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/tests/__init__.py
U z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/tests/ftesting.zcml
U z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/zope.app.publisher.browser.zcml
U z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/zope.traversing.browser.zcml
-=-
Modified: z3c.layer.pagelet/trunk/CHANGES.txt
===================================================================
--- z3c.layer.pagelet/trunk/CHANGES.txt 2009-02-14 11:26:00 UTC (rev 96522)
+++ z3c.layer.pagelet/trunk/CHANGES.txt 2009-02-14 13:43:36 UTC (rev 96523)
@@ -2,13 +2,20 @@
CHANGES
=======
-1.0.2dev (unreleased)
----------------------
+1.1.0 (unreleased)
+------------------
- Bugfix: use IContentTemplate instead of IPageTemplate which avoids to get the
- layout template if no IPageTemplate is registered
+ layout template if no IPageTemplate is registered.
+- Using ``zope.location.interfaces.ISite`` instead of
+ ``zope.app.component.interfaces.ISite``.
+- Using ``zope.container`` instead of ``zope.app.container``.
+
+- Cleaned up dependencies.
+
+
1.0.1 (2008-01-24)
------------------
@@ -19,14 +26,11 @@
------------------
- Restructure: Move ``z3c.layer.pagelet`` package to it's own top level
- package form ``zope.layer`` to ``z3c.layer.pagelet``.
+ package form ``z3c.layer`` to ``z3c.layer.pagelet``.
- Restructure: Removed ``zope.app.form`` support from pagelet layer.
-- Restructure: Moved implementation from ``z3c.layer`` to
- ``z3c.layer.pagelet``.
-
0.2.3 (2007-11-07)
------------------
Modified: z3c.layer.pagelet/trunk/buildout.cfg
===================================================================
--- z3c.layer.pagelet/trunk/buildout.cfg 2009-02-14 11:26:00 UTC (rev 96522)
+++ z3c.layer.pagelet/trunk/buildout.cfg 2009-02-14 13:43:36 UTC (rev 96523)
@@ -1,8 +1,7 @@
[buildout]
develop = .
+parts = test checker coverage-test coverage-report
-parts = test checker coverage
-
[test]
recipe = zc.recipe.testrunner
eggs = z3c.layer.pagelet [test]
@@ -11,6 +10,13 @@
recipe = lovely.recipe:importchecker
path = src/z3c/layer/pagelet
-[coverage]
+[coverage-test]
+recipe = zc.recipe.testrunner
+eggs = z3c.layer.pagelet [test]
+defaults = ['--tests-pattern', '^f?tests$', '--coverage', '../../coverage']
+
+
+[coverage-report]
recipe = zc.recipe.egg
eggs = z3c.coverage
+scripts = coverage=coverage-report
Modified: z3c.layer.pagelet/trunk/setup.py
===================================================================
--- z3c.layer.pagelet/trunk/setup.py 2009-02-14 11:26:00 UTC (rev 96522)
+++ z3c.layer.pagelet/trunk/setup.py 2009-02-14 13:43:36 UTC (rev 96523)
@@ -60,21 +60,24 @@
extras_require = dict(
test = [
'zope.testbrowser',
- 'zope.app.securitypolicy',
+ 'zope.securitypolicy',
'zope.app.testing',
'zope.app.zcmlfiles',
'zope.app.twisted',
'zope.viewlet',
'z3c.pagelet',
'zc.configuration',
+ 'zope.component',
+ 'zope.app.component',
],
),
install_requires = [
'setuptools',
'zope.configuration',
'zope.traversing',
- 'zope.app.http',
'zope.app.publisher',
+ 'zope.app.security',
+ 'zope.app.exception',
],
zip_safe = False,
)
Modified: z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/browser/__init__.py
===================================================================
--- z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/browser/__init__.py 2009-02-14 11:26:00 UTC (rev 96522)
+++ z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/browser/__init__.py 2009-02-14 13:43:36 UTC (rev 96523)
@@ -36,7 +36,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')
@@ -48,11 +48,11 @@
auth = zope.component.getUtility(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),
IContentTemplate)
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),
IContentTemplate)
return template(self)
Modified: z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/tests/__init__.py
===================================================================
--- z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/tests/__init__.py 2009-02-14 11:26:00 UTC (rev 96522)
+++ z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/tests/__init__.py 2009-02-14 13:43:36 UTC (rev 96523)
@@ -15,8 +15,6 @@
$Id: __init__.py 97 2007-03-29 22:58:27Z rineichen $
"""
-import zope.interface
-import zope.component
from zope.publisher.browser import BrowserPage
from zope.security.interfaces import Unauthorized
from zope.exceptions.interfaces import UserError
@@ -54,4 +52,4 @@
def __call__(self):
raise Exception('simply system error')
- return u''
\ No newline at end of file
+ return u''
Modified: z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/tests/ftesting.zcml
===================================================================
--- z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/tests/ftesting.zcml 2009-02-14 11:26:00 UTC (rev 96522)
+++ z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/tests/ftesting.zcml 2009-02-14 13:43:36 UTC (rev 96523)
@@ -19,17 +19,15 @@
<exclude package="zope.app.authentication.browser" file="principalfolder.zcml" />
<exclude package="zope.app.authentication.browser" file="session.zcml" />
<exclude package="zope.app.broken" file="browser.zcml" />
- <exclude package="zope.app.container.browser" />
<exclude package="zope.app.error.browser" />
<exclude package="zope.app.folder.browser" />
<exclude package="zope.app.i18n.browser" />
- <exclude package="zope.app.securitypolicy.browser" />
<exclude package="zope.dublincore.browser" />
<!-- meta configure -->
<include package="zope.i18n" file="meta.zcml" />
+ <include package="zope.component" file="meta.zcml" />
<include package="zope.app.component" file="meta.zcml" />
- <include package="zope.app.component.browser" file="meta.zcml" />
<include package="zope.app.pagetemplate" file="meta.zcml" />
<include package="zope.app.publication" file="meta.zcml" />
<include package="zope.app.publisher" file="meta.zcml" />
@@ -46,14 +44,14 @@
<include package="zope.annotation" />
<include package="zope.app.appsetup" />
<include package="zope.app.component" />
- <include package="zope.app.container" />
+ <include package="zope.container" />
<include package="zope.app.error" />
<include package="zope.app.http.exception" />
<include package="zope.app.i18n" />
<include package="zope.app.publication" />
<include package="zope.app.publisher.browser" />
<include package="zope.app.security" />
- <include package="zope.app.securitypolicy" />
+ <include package="zope.securitypolicy" />
<include package="zope.app.twisted" />
<include package="zope.app.wsgi" />
<include package="zope.component" />
Modified: z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/zope.app.publisher.browser.zcml
===================================================================
--- z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/zope.app.publisher.browser.zcml 2009-02-14 11:26:00 UTC (rev 96522)
+++ z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/zope.app.publisher.browser.zcml 2009-02-14 13:43:36 UTC (rev 96523)
@@ -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.pagelet/trunk/src/z3c/layer/pagelet/zope.traversing.browser.zcml
===================================================================
--- z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/zope.traversing.browser.zcml 2009-02-14 11:26:00 UTC (rev 96522)
+++ z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/zope.traversing.browser.zcml 2009-02-14 13:43:36 UTC (rev 96523)
@@ -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"
More information about the Checkins
mailing list