[Checkins] SVN: five.pt/trunk/src/five/pt/ Fixed tests.
Malthe Borch
mborch at gmail.com
Thu Apr 16 06:08:27 EDT 2009
Log message for revision 99210:
Fixed tests.
Changed:
U five.pt/trunk/src/five/pt/pagetemplate.py
U five.pt/trunk/src/five/pt/tests/test_pagetemplatefile.py
U five.pt/trunk/src/five/pt/zcml.txt
-=-
Modified: five.pt/trunk/src/five/pt/pagetemplate.py
===================================================================
--- five.pt/trunk/src/five/pt/pagetemplate.py 2009-04-16 09:38:22 UTC (rev 99209)
+++ five.pt/trunk/src/five/pt/pagetemplate.py 2009-04-16 10:08:27 UTC (rev 99210)
@@ -29,7 +29,7 @@
def render_macro(self, macro, global_scope=False, parameters=None):
context = self._pt_get_context(None, None)
-
+
if parameters is not None:
context.update(parameters)
Modified: five.pt/trunk/src/five/pt/tests/test_pagetemplatefile.py
===================================================================
--- five.pt/trunk/src/five/pt/tests/test_pagetemplatefile.py 2009-04-16 09:38:22 UTC (rev 99209)
+++ five.pt/trunk/src/five/pt/tests/test_pagetemplatefile.py 2009-04-16 10:08:27 UTC (rev 99210)
@@ -43,7 +43,7 @@
self.failUnless('here==container:True' in result)
self.failUnless("root:(\'\',)" in result)
self.failUnless("nothing:None" in result)
- self.failUnless("modules:<foo>" in result)
+ self.failUnless("modules:<foo>" in result)
def test_options(self):
view = OptionsView(self.folder, self.folder.REQUEST)
Modified: five.pt/trunk/src/five/pt/zcml.txt
===================================================================
--- five.pt/trunk/src/five/pt/zcml.txt 2009-04-16 09:38:22 UTC (rev 99209)
+++ five.pt/trunk/src/five/pt/zcml.txt 2009-04-16 10:08:27 UTC (rev 99210)
@@ -25,7 +25,7 @@
... interface.Interface, name="test1")
>>> factory.index
- <five.pt.pagetemplate.BoundViewPageTemplateFile '.../test.pt'>
+ <ViewPageTemplateFile .../test.pt>
We can base the view on an existing class.
@@ -43,11 +43,34 @@
... interface.Interface, name="test2")
>>> factory.index
- <five.pt.pagetemplate.BoundViewPageTemplateFile '.../test.pt'>
+ <ViewPageTemplateFile .../test.pt>
>>> issubclass(factory, View)
True
+If the ``__call__`` attribute is set to a template, calling the view will
+render the template.
+
+ >>> from five.pt.pagetemplate import ViewPageTemplateFile
+
+ >>> class View(object):
+ ... __call__ = ViewPageTemplateFile(os.path.join(path, "test.pt"))
+
+ >>> zcml.page_directive(
+ ... context, "test3", "zope2.View", None, class_=View)
+
+ >>> context.execute_actions()
+
+ >>> factory = component.getSiteManager().adapters.lookup(
+ ... (interface.Interface, IDefaultBrowserLayer),
+ ... interface.Interface, name="test3")
+
+ >>> factory.__call__
+ <ViewPageTemplateFile .../test.pt>
+
+ >>> issubclass(factory, View)
+ True
+
Viewlet managers
----------------
@@ -68,7 +91,7 @@
... IViewletManager, name="test1")
>>> factory.template
- <five.pt.pagetemplate.BoundViewPageTemplateFile '.../test.pt'>
+ <ViewPageTemplateFile .../test.pt>
We can base the viewlet manager on an existing class.
@@ -88,7 +111,7 @@
... IViewletManager, name="test2")
>>> factory.template
- <five.pt.pagetemplate.BoundViewPageTemplateFile '.../test.pt'>
+ <ViewPageTemplateFile .../test.pt>
>>> issubclass(factory, ViewletManager)
True
@@ -109,7 +132,7 @@
... interface.Interface, name="test1")
>>> factory.index
- <five.pt.pagetemplate.BoundViewPageTemplateFile '.../test.pt'>
+ <ViewPageTemplateFile .../test.pt>
We can base the viewlet on an existing class.
@@ -129,7 +152,7 @@
... interface.Interface, name="test2")
>>> factory.index
- <five.pt.pagetemplate.BoundViewPageTemplateFile '.../test.pt'>
+ <ViewPageTemplateFile .../test.pt>
>>> issubclass(factory, Viewlet)
True
More information about the Checkins
mailing list