[Checkins] SVN: z3c.layer.pagelet/branches/adamg-backportfixes/ merge r84685-r94177
Adam Groszer
agroszer at gmail.com
Fri Apr 3 04:05:56 EDT 2009
Log message for revision 98818:
merge r84685-r94177
- Bugfix: use IContentTemplate instead of IPageTemplate which avoids to get the
layout template if no IPageTemplate is registered
Changed:
U z3c.layer.pagelet/branches/adamg-backportfixes/CHANGES.txt
U z3c.layer.pagelet/branches/adamg-backportfixes/setup.py
U z3c.layer.pagelet/branches/adamg-backportfixes/src/z3c/layer/pagelet/browser/__init__.py
U z3c.layer.pagelet/branches/adamg-backportfixes/src/z3c/layer/pagelet/tests/ftesting.zcml
U z3c.layer.pagelet/branches/adamg-backportfixes/src/z3c/layer/pagelet/tests/test_layer.py
U z3c.layer.pagelet/branches/adamg-backportfixes/src/z3c/layer/pagelet/zope.app.publication.zcml
-=-
Modified: z3c.layer.pagelet/branches/adamg-backportfixes/CHANGES.txt
===================================================================
--- z3c.layer.pagelet/branches/adamg-backportfixes/CHANGES.txt 2009-04-03 07:18:20 UTC (rev 98817)
+++ z3c.layer.pagelet/branches/adamg-backportfixes/CHANGES.txt 2009-04-03 08:05:56 UTC (rev 98818)
@@ -2,6 +2,13 @@
CHANGES
=======
+1.0.2dev (unreleased)
+---------------------
+
+- Bugfix: use IContentTemplate instead of IPageTemplate which avoids to get the
+ layout template if no IPageTemplate is registered
+
+
1.0.1 (2008-01-24)
------------------
@@ -36,7 +43,7 @@
- Bug: Fixed test failures due to depency updates.
-- Restructure: Fixed deprecation warninf for ``ZopeSecurityPolicy``.
+- Restructure: Fixed deprecation warning for ``ZopeSecurityPolicy``.
0.2.1 (2007-??-??)
Modified: z3c.layer.pagelet/branches/adamg-backportfixes/setup.py
===================================================================
--- z3c.layer.pagelet/branches/adamg-backportfixes/setup.py 2009-04-03 07:18:20 UTC (rev 98817)
+++ z3c.layer.pagelet/branches/adamg-backportfixes/setup.py 2009-04-03 08:05:56 UTC (rev 98818)
@@ -26,7 +26,7 @@
setup(
name = 'z3c.layer.pagelet',
- version = '1.0.1',
+ version = '1.0.2dev',
author='Zope Foundation and Contributors',
author_email='zope-dev at zope.org',
description = "Pagelet layer setup for Zope3",
@@ -78,4 +78,3 @@
],
zip_safe = False,
)
-
Modified: z3c.layer.pagelet/branches/adamg-backportfixes/src/z3c/layer/pagelet/browser/__init__.py
===================================================================
--- z3c.layer.pagelet/branches/adamg-backportfixes/src/z3c/layer/pagelet/browser/__init__.py 2009-04-03 07:18:20 UTC (rev 98817)
+++ z3c.layer.pagelet/branches/adamg-backportfixes/src/z3c/layer/pagelet/browser/__init__.py 2009-04-03 08:05:56 UTC (rev 98818)
@@ -21,7 +21,7 @@
from zope.app.exception.browser.user import UserErrorView
from zope.app.exception.browser.notfound import NotFound
from zope.app.security.interfaces import IAuthentication
-from z3c.template.interfaces import IPageTemplate
+from z3c.template.interfaces import IContentTemplate
from z3c.pagelet import browser
@@ -49,7 +49,7 @@
auth.unauthorized(principal.id, self.request)
if self.request.response.getStatus() not in (302, 303):
template = zope.component.getMultiAdapter((self, self.request),
- IPageTemplate)
+ IContentTemplate)
return template(self)
@@ -63,5 +63,5 @@
def render(self):
self.request.response.setStatus(404)
template = zope.component.getMultiAdapter((self, self.request),
- IPageTemplate)
+ IContentTemplate)
return template(self)
Modified: z3c.layer.pagelet/branches/adamg-backportfixes/src/z3c/layer/pagelet/tests/ftesting.zcml
===================================================================
--- z3c.layer.pagelet/branches/adamg-backportfixes/src/z3c/layer/pagelet/tests/ftesting.zcml 2009-04-03 07:18:20 UTC (rev 98817)
+++ z3c.layer.pagelet/branches/adamg-backportfixes/src/z3c/layer/pagelet/tests/ftesting.zcml 2009-04-03 08:05:56 UTC (rev 98818)
@@ -24,7 +24,6 @@
<exclude package="zope.app.folder.browser" />
<exclude package="zope.app.i18n.browser" />
<exclude package="zope.app.securitypolicy.browser" />
- <exclude package="zope.app.session" file="browser.zcml" />
<exclude package="zope.dublincore.browser" />
<!-- meta configure -->
@@ -55,7 +54,6 @@
<include package="zope.app.publisher.browser" />
<include package="zope.app.security" />
<include package="zope.app.securitypolicy" />
- <include package="zope.app.session" />
<include package="zope.app.twisted" />
<include package="zope.app.wsgi" />
<include package="zope.component" />
Modified: z3c.layer.pagelet/branches/adamg-backportfixes/src/z3c/layer/pagelet/tests/test_layer.py
===================================================================
--- z3c.layer.pagelet/branches/adamg-backportfixes/src/z3c/layer/pagelet/tests/test_layer.py 2009-04-03 07:18:20 UTC (rev 98817)
+++ z3c.layer.pagelet/branches/adamg-backportfixes/src/z3c/layer/pagelet/tests/test_layer.py 2009-04-03 08:05:56 UTC (rev 98818)
@@ -15,18 +15,23 @@
$Id: __init__.py 97 2007-03-29 22:58:27Z rineichen $
"""
+import re
import unittest
+from zope.testing import renormalizing
from zope.app.testing import functional
functional.defineLayer('TestLayer', 'ftesting.zcml')
+checker = renormalizing.RENormalizing([
+ (re.compile(r'httperror_seek_wrapper:', re.M), 'HTTPError:'),
+ ])
+
def test_suite():
suite = unittest.TestSuite()
- s = functional.FunctionalDocFileSuite('../README.txt')
+ s = functional.FunctionalDocFileSuite('../README.txt', checker=checker)
s.layer = TestLayer
suite.addTest(s)
-
return suite
if __name__ == '__main__':
Modified: z3c.layer.pagelet/branches/adamg-backportfixes/src/z3c/layer/pagelet/zope.app.publication.zcml
===================================================================
--- z3c.layer.pagelet/branches/adamg-backportfixes/src/z3c/layer/pagelet/zope.app.publication.zcml 2009-04-03 07:18:20 UTC (rev 98817)
+++ z3c.layer.pagelet/branches/adamg-backportfixes/src/z3c/layer/pagelet/zope.app.publication.zcml 2009-04-03 08:05:56 UTC (rev 98818)
@@ -1,14 +1,14 @@
<configure
xmlns="http://namespaces.zope.org/zope"
- xmlns:browser="http://namespaces.zope.org/browser"
i18n_domain="z3c">
- <browser:view
+ <view
for="zope.app.publication.interfaces.IFileContent"
+ type="z3c.layer.pagelet.IPageletBrowserLayer"
provides="zope.publisher.interfaces.browser.IBrowserPublisher"
- class="zope.app.publication.traversers.FileContentTraverser"
+ factory="zope.app.publication.traversers.FileContentTraverser"
permission="zope.Public"
- layer="z3c.layer.pagelet.IPageletBrowserLayer"
+ allowed_interface="zope.publisher.interfaces.browser.IBrowserPublisher"
/>
</configure>
More information about the Checkins
mailing list