[Checkins] SVN: z3c.layer.pagelet/trunk/ - Bugfix: use IContentTemplate instead of IPageTemplate which avoids

[Roger Ineichen]

Log message for revision 94177:
  - Bugfix: use IContentTemplate instead of IPageTemplate which avoids
    to get the layout template if no IPageTemplate is registered
  - Added RENormalizing for broken test output

Changed:
  U   z3c.layer.pagelet/trunk/CHANGES.txt
  U   z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/browser/__init__.py
  U   z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/tests/ftesting.zcml
  U   z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/tests/test_layer.py

-=-
Modified: z3c.layer.pagelet/trunk/CHANGES.txt
===================================================================
--- z3c.layer.pagelet/trunk/CHANGES.txt	2008-12-18 23:18:10 UTC (rev 94176)
+++ z3c.layer.pagelet/trunk/CHANGES.txt	2008-12-18 23:59:56 UTC (rev 94177)
@@ -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)
 ------------------
 

Modified: z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/browser/__init__.py
===================================================================
--- z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/browser/__init__.py	2008-12-18 23:18:10 UTC (rev 94176)
+++ z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/browser/__init__.py	2008-12-18 23:59:56 UTC (rev 94177)
@@ -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/trunk/src/z3c/layer/pagelet/tests/ftesting.zcml
===================================================================
--- z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/tests/ftesting.zcml	2008-12-18 23:18:10 UTC (rev 94176)
+++ z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/tests/ftesting.zcml	2008-12-18 23:59:56 UTC (rev 94177)
@@ -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/trunk/src/z3c/layer/pagelet/tests/test_layer.py
===================================================================
--- z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/tests/test_layer.py	2008-12-18 23:18:10 UTC (rev 94176)
+++ z3c.layer.pagelet/trunk/src/z3c/layer/pagelet/tests/test_layer.py	2008-12-18 23:59:56 UTC (rev 94177)
@@ -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__':