[Checkins] SVN: z3ext.layout/trunk/ fixed tests
Michael Howitz
mh at gocept.com
Thu Nov 18 02:58:20 EST 2010
Log message for revision 118457:
fixed tests
Changed:
U z3ext.layout/trunk/CHANGES.txt
U z3ext.layout/trunk/src/z3ext/layout/pagelet.txt
-=-
Modified: z3ext.layout/trunk/CHANGES.txt
===================================================================
--- z3ext.layout/trunk/CHANGES.txt 2010-11-18 07:54:10 UTC (rev 118456)
+++ z3ext.layout/trunk/CHANGES.txt 2010-11-18 07:58:19 UTC (rev 118457)
@@ -17,7 +17,9 @@
- Added ``z3ext:expressiontype`` directive
+- Fixed tests.
+
2.2.2 (2009-09-14)
------------------
@@ -207,7 +209,7 @@
1.5.1 (2008-10-14)
------------------
-- Fixed missing NotFount in @@pagelet
+- Fixed missing NotFount in @@pagelet
- Log errors in @@pagelet
@@ -292,7 +294,7 @@
------------------
- Added 'redirect' method to IBrowserPagelet, this is usefull
- when we need redirect during 'update' method and we don't
+ when we need redirect during 'update' method and we don't
need render pagelet at all.
- Added adapter to IPagelet for (context, request),
Modified: z3ext.layout/trunk/src/z3ext/layout/pagelet.txt
===================================================================
--- z3ext.layout/trunk/src/z3ext/layout/pagelet.txt 2010-11-18 07:54:10 UTC (rev 118456)
+++ z3ext.layout/trunk/src/z3ext/layout/pagelet.txt 2010-11-18 07:58:19 UTC (rev 118457)
@@ -2,7 +2,7 @@
Pagelet directive
=================
-Show how we can use the pagelet directive. Register the meta configuration for
+Show how we can use the pagelet directive. Register the meta configuration for
the directive.
>>> import os, tempfile, sys
@@ -75,7 +75,7 @@
Get the pagelet for the new content object
>>> import zope.component
- >>> pagelet = zope.component.queryMultiAdapter((Content(), TestRequest()),
+ >>> pagelet = zope.component.queryMultiAdapter((Content(), TestRequest()),
... name='custom.html')
and check them:
@@ -107,10 +107,10 @@
... </configure>
... """, context)
-And if we get the pagelet, we can see that the object provides the new
+And if we get the pagelet, we can see that the object provides the new
pagelet interface:
- >>> pagelet = component.queryMultiAdapter((object(), TestRequest()),
+ >>> pagelet = component.queryMultiAdapter((object(), TestRequest()),
... name='new.html')
>>> pagelet
<z3ext.layout.zcml.PageletClass from <class 'z3ext.layout.TESTS.NewPagelet'> ...>
@@ -123,7 +123,7 @@
>>> class INewPagelet2(interface.Interface):
... """New pagelet interface."""
- ...
+ ...
... number = schema.Int(
... title = u'Number',
... required = True)
@@ -148,7 +148,7 @@
>>> class INewPagelet2(interface.Interface):
... """New pagelet interface."""
- ...
+ ...
... number = schema.Int(
... title = u'Number',
... required = False,
@@ -203,10 +203,10 @@
...
ZopeXMLConfigurationError: ...invalid literal for int()...
-Schema field should implement IFromUnicode
+Schema field should implement IFromUnicode
>>> class INewPagelet3(interface.Interface):
- ...
+ ...
... date = schema.Date(
... title = u'Date',
... required = False)
@@ -274,7 +274,7 @@
... for="*"
... name="noclass.html" />
... </configure>
- ... """, context)
+ ... """, context)
>>> pagelet = component.queryMultiAdapter(
... (object(), TestRequest()), name='noclass.html')
@@ -311,7 +311,7 @@
... </configure>
... """%template, context)
- >>> pagelet = component.queryMultiAdapter((object(), TestRequest()),
+ >>> pagelet = component.queryMultiAdapter((object(), TestRequest()),
... name='template.html')
>>> pagelet
<z3ext.layout.zcml.PageletClass from None ...>
@@ -349,7 +349,7 @@
... name="index.html"
... for="* z3ext.layout.TESTS.IContext2" />
... </configure>
- ... """, context)
+ ... """, context)
>>> context2 = Context2()
@@ -370,7 +370,7 @@
We should use page template as template for pagelet or we should
provide IPagelet adapter for pagelet
- >>> pagelet = component.queryMultiAdapter((object(), TestRequest()),
+ >>> pagelet = component.queryMultiAdapter((object(), TestRequest()),
... name='noclass.html')
>>> pagelet.render()
Traceback (most recent call last):
@@ -403,7 +403,7 @@
We can redirect during pagelet rendering, in this case render method
doesn't call.
- >>> pagelet = component.queryMultiAdapter((object(), TestRequest()),
+ >>> pagelet = component.queryMultiAdapter((object(), TestRequest()),
... name='noclass.html')
>>> pagelet.redirect('/')
>>> pagelet.isRedirected
@@ -508,7 +508,7 @@
>>> pagelet = component.queryMultiAdapter(
... (object(), TestRequest()), ITestPagelet)
-
+
>>> ITestPagelet.providedBy(pagelet)
True
>>> print pagelet.render()
@@ -537,14 +537,14 @@
by default IPagelet
- >>> print publisher()
+ >>> print publisher()()
<div>My pagelet - default</div>
- >>> print publisher.publishTraverse(request, '')
+ >>> print publisher.publishTraverse(request, '')()
<div>My pagelet - default</div>
>>> print publisher.publishTraverse(
- ... request, 'z3ext.layout.tests.ITestPagelet')
+ ... request, 'z3ext.layout.tests.ITestPagelet')()
<div>My pagelet</div>
We can register our marker interface as named utility and use name
@@ -554,7 +554,7 @@
... ITestPagelet, z3ext.layout.interfaces.IPageletType, name='testPageletType')
>>> interface.alsoProvides(ITestPagelet, z3ext.layout.interfaces.IPageletType)
- >>> print publisher.publishTraverse(request, 'testPageletType')
+ >>> print publisher.publishTraverse(request, 'testPageletType')()
<div>My pagelet</div>
We can provide additional context for pagelet
@@ -583,7 +583,7 @@
... </configure>"""%template41, context)
>>> publisher = component.getMultiAdapter((Content(),request), name='pagelet')
- >>> print publisher.publishTraverse(request, 'myPagelet4')
+ >>> print publisher.publishTraverse(request, 'myPagelet4')()
<div>My pagelet4</div>
Or multiple contexts
@@ -612,7 +612,7 @@
... </configure>"""%template5, context)
>>> publisher = component.getMultiAdapter((Content(),request), name='pagelet')
- >>> print publisher.publishTraverse(request, 'myPagelet5')
+ >>> print publisher.publishTraverse(request, 'myPagelet5')()
<div>My pagelet5</div>
We can use interface as pagelet 'type'
@@ -647,7 +647,7 @@
... </configure>"""%template6, context)
>>> pagelet = component.getMultiAdapter((Content(), request), name='pagelet')
- >>> print pagelet.publishTraverse(request, 'myPagelet6')
+ >>> print pagelet.publishTraverse(request, 'myPagelet6')()
<div>My pagelet6</div>
we can call named pagelets
@@ -666,7 +666,7 @@
... </configure>"""%template7, context)
>>> pagelet = component.getMultiAdapter((Content(), request), name='pagelet')
- >>> print pagelet.publishTraverse(request, 'myPagelet6+named')
+ >>> print pagelet.publishTraverse(request, 'myPagelet6+named')()
<div>My pagelet7</div>
@@ -1021,8 +1021,8 @@
raise Exception('Pagelet Error')</li>
</ul>Exception: Pagelet Error<br />
</p><br />
-
+
Pagelet with extra context
>>> open(templateFileName, 'w').write('''
@@ -1102,9 +1102,9 @@
>>> from zope.publisher.browser import TestRequest
>>> class MyView(BrowserPagelet):
- ...
+ ...
... layoutname = 'unknown'
- ...
+ ...
... def render(self):
... return self.context.__name__
More information about the checkins
mailing list