[Checkins] SVN: z3ext.layout/trunk/s update deps
Nikolay Kim
fafhrd91 at gmail.com
Fri Jan 15 09:13:52 EST 2010
Log message for revision 108145:
update deps
Changed:
U z3ext.layout/trunk/setup.py
U z3ext.layout/trunk/src/z3ext/layout/configure.zcml
A z3ext.layout/trunk/src/z3ext/layout/overrides.zcml
U z3ext.layout/trunk/src/z3ext/layout/pagelet.txt
U z3ext.layout/trunk/src/z3ext/layout/tales.py
-=-
Modified: z3ext.layout/trunk/setup.py
===================================================================
--- z3ext.layout/trunk/setup.py 2010-01-15 14:13:30 UTC (rev 108144)
+++ z3ext.layout/trunk/setup.py 2010-01-15 14:13:51 UTC (rev 108145)
@@ -61,11 +61,11 @@
'zope.security',
'zope.publisher',
'zope.configuration',
- 'zope.pagetemplate',
'zope.tales',
'zope.error',
'zope.browserpage',
'zope.app.schema',
+ 'zope.app.pagetemplate',
'z3c.pt',
],
extras_require = dict(test=['zope.container',
Modified: z3ext.layout/trunk/src/z3ext/layout/configure.zcml
===================================================================
--- z3ext.layout/trunk/src/z3ext/layout/configure.zcml 2010-01-15 14:13:30 UTC (rev 108144)
+++ z3ext.layout/trunk/src/z3ext/layout/configure.zcml 2010-01-15 14:13:51 UTC (rev 108145)
@@ -2,6 +2,7 @@
xmlns="http://namespaces.zope.org/zope"
xmlns:zcml="http://namespaces.zope.org/zcml"
xmlns:z3ext="http://namespaces.zope.org/z3ext"
+ xmlns:tales="http://namespaces.zope.org/tales"
xmlns:browser="http://namespaces.zope.org/browser"
i18n_domain="z3ext.layout">
@@ -21,6 +22,11 @@
name="pagelet"
factory=".expressions.PageletTranslator" />
+ <!-- resourcepackage: tales expression -->
+ <tales:expressiontype
+ name="pagelet"
+ handler=".tales.TALESPageletExpression" />
+
<!-- @@pagelet view -->
<adapter
name="pagelet"
@@ -78,11 +84,9 @@
description="Page layout. It contains html headers, html body, etc."
template="layoutpage.pt" />
- <!-- default view -->
- <browser:defaultView name="index.html" />
-
+ <!-- default page -->
<z3ext:pagelet
- for="*"
+ for="zope.interface.Interface"
name="index.html"
template="index.pt" />
Added: z3ext.layout/trunk/src/z3ext/layout/overrides.zcml
===================================================================
--- z3ext.layout/trunk/src/z3ext/layout/overrides.zcml (rev 0)
+++ z3ext.layout/trunk/src/z3ext/layout/overrides.zcml 2010-01-15 14:13:51 UTC (rev 108145)
@@ -0,0 +1,7 @@
+<configure xmlns="http://namespaces.zope.org/zope"
+ xmlns:browser="http://namespaces.zope.org/browser">
+
+ <!-- default view -->
+ <browser:defaultView name="index.html" />
+
+</configure>
Modified: z3ext.layout/trunk/src/z3ext/layout/pagelet.txt
===================================================================
--- z3ext.layout/trunk/src/z3ext/layout/pagelet.txt 2010-01-15 14:13:30 UTC (rev 108144)
+++ z3ext.layout/trunk/src/z3ext/layout/pagelet.txt 2010-01-15 14:13:51 UTC (rev 108145)
@@ -795,8 +795,10 @@
Also we should register tales expression
>>> from z3ext.layout import tales
+ >>> from zope.browserpage.metaconfigure import registerType
+ >>> registerType('pagelet', tales.TALESPageletExpression)
-Finally we look up the view and render it.
+ Finally we look up the view and render it.
>>> from z3ext.layout.tests import SimpleViewClass
@@ -1011,7 +1013,7 @@
>>> print error.getLogEntries()[0]['tb_html']
<p>Traceback (most recent call last):
<ul>
- <li> Module z3ext.layout.tales, line 34, in render<br />
+ <li> Module z3ext.layout.tales, line 33, in render<br />
return pagelet.updateAndRender()</li>
<li> Module z3ext.layout.pagelet, line 131, in updateAndRender<br />
return self.render()</li>
Modified: z3ext.layout/trunk/src/z3ext/layout/tales.py
===================================================================
--- z3ext.layout/trunk/src/z3ext/layout/tales.py 2010-01-15 14:13:30 UTC (rev 108144)
+++ z3ext.layout/trunk/src/z3ext/layout/tales.py 2010-01-15 14:13:51 UTC (rev 108145)
@@ -18,7 +18,6 @@
import logging, sys
from zope.component import queryUtility, queryAdapter, queryMultiAdapter
from zope.error.interfaces import IErrorReportingUtility
-from zope.pagetemplate.engine import Engine, TrustedEngine
from zope.tales.expressions import StringExpr, SimpleModuleImporter
from pagelet import queryPagelet
@@ -50,7 +49,3 @@
view = econtext.vars['view']
return self.render(context, request, view, name)
-
-
-Engine.registerType("pagelet", TALESPageletExpression)
-TrustedEngine.registerType("pagelet", TALESPageletExpression)
More information about the checkins
mailing list