[Zope-Checkins] SVN: Zope/branches/ajung-zpt-end-game/lib/python/Products/PageTemplates/Expressions.py cleanup (shorter name, better docstring)
Log message for revision 68311:
cleanup (shorter name, better docstring)
Changed:
U
Zope/branches/ajung-zpt-end-game/lib/python/Products/PageTemplates/Expressions.py
-=-
Modified:
Zope/branches/ajung-zpt-end-game/lib/python/Products/PageTemplates/Expressions.py
===
---
Zope/branches/ajung-zpt-end-game/lib/python/Products/PageTemplates/Expressions.py
2006-05-28 13:49:16 UTC (rev 68310)
+++
Zope/branches/ajung-zpt-end-game/lib/python/Products/PageTemplates/Expressions.py
2006-05-28 13:54:27 UTC (rev 68311)
@@ -53,9 +53,12 @@
# Path Expression uses them
ZopeUndefs = Undefs + (NotFound, Unauthorized)
-def boboTraverseAwareSimpleTraverse(object, path_items, econtext):
-A slightly modified version of zope.tales.expressions.simpleTraverse
-that interacts correctly with objects providing
OFS.interfaces.ITraversable.
+def boboAwareZopeTraverse(object, path_items, econtext):
+Traverses a sequence of names, first trying attributes then items.
+
+This uses Zope 3 path traversal where possible and interacts
+correctly with objects providing OFS.interface.ITraversable when
+necessary (bobo-awareness).
request = getattr(econtext, 'request', None)
path_items = list(path_items)
@@ -97,7 +100,7 @@
def __init__(self, name, expr, engine):
super(ZopePathExpr, self).__init__(name, expr, engine,
- boboTraverseAwareSimpleTraverse)
+ boboAwareZopeTraverse)
# override this to support different call metrics (see bottom of
# method) and Zope 2's traversal exceptions (ZopeUndefs instead of
@@ -232,8 +235,8 @@
if isinstance(name, basestring):
name = name.split('/')
try:
-ob1 = boboTraverseAwareSimpleTraverse(ob1, name, None)
-ob2 = boboTraverseAwareSimpleTraverse(ob2, name, None)
+ob1 = boboAwareZopeTraverse(ob1, name, None)
+ob2 = boboAwareZopeTraverse(ob2, name, None)
except LookupError:
return False
return ob1 == ob2
___
Zope-Checkins maillist - Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/ajung-zpt-end-game/lib/python/Products/PageTemplates/Expressions.py Catch all possible (in Zope2) traversal exceptions
Log message for revision 68312: Catch all possible (in Zope2) traversal exceptions Changed: U Zope/branches/ajung-zpt-end-game/lib/python/Products/PageTemplates/Expressions.py -=- Modified: Zope/branches/ajung-zpt-end-game/lib/python/Products/PageTemplates/Expressions.py === --- Zope/branches/ajung-zpt-end-game/lib/python/Products/PageTemplates/Expressions.py 2006-05-28 13:54:27 UTC (rev 68311) +++ Zope/branches/ajung-zpt-end-game/lib/python/Products/PageTemplates/Expressions.py 2006-05-28 15:14:20 UTC (rev 68312) @@ -237,7 +237,7 @@ try: ob1 = boboAwareZopeTraverse(ob1, name, None) ob2 = boboAwareZopeTraverse(ob2, name, None) -except LookupError: +except ZopeUndefs: return False return ob1 == ob2 ___ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Products.Five/trunk/formlib/pageform.pt Added appropriate @@standard_macros usage.
Log message for revision 68314: Added appropriate @@standard_macros usage. Changed: U Products.Five/trunk/formlib/pageform.pt -=- Modified: Products.Five/trunk/formlib/pageform.pt === --- Products.Five/trunk/formlib/pageform.pt 2006-05-28 15:34:06 UTC (rev 68313) +++ Products.Five/trunk/formlib/pageform.pt 2006-05-28 19:59:53 UTC (rev 68314) @@ -1,9 +1,13 @@ -html metal:define-macro=main +html xmlns=http://www.w3.org/1999/xhtml; + xmlns:metal=http://xml.zope.org/namespaces/metal; + xmlns:tal=http://xml.zope.org/namespaces/tal; + xmlns:i18n=http://xml.zope.org/namespaces/i18n; + metal:use-macro=context/@@standard_macros/page head /head body -div +div metal:fill-slot=body div metal:define-macro=form ___ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/ajung-zpt-end-game/lib/python/TAL/tests/ Cope with changes in the TAL interpreter from TAL 1.5 to 1.6:
Log message for revision 68318: Cope with changes in the TAL interpreter from TAL 1.5 to 1.6: i18n:name and i18n:translate on the same element is now supported. Moreover, i18n:translate isn't automatically assumed for those elements with i18n:name. Also, the element that i18n:name is on isn't automatically removed anymore. You'll have to use tal:omit-tag to explicitly make it go away. For more info, see http://zope.org/Collectors/Zope3-dev/301. Changed: U Zope/branches/ajung-zpt-end-game/lib/python/TAL/tests/input/test29.html U Zope/branches/ajung-zpt-end-game/lib/python/TAL/tests/output/test29.html -=- Modified: Zope/branches/ajung-zpt-end-game/lib/python/TAL/tests/input/test29.html === --- Zope/branches/ajung-zpt-end-game/lib/python/TAL/tests/input/test29.html 2006-05-28 23:07:07 UTC (rev 68317) +++ Zope/branches/ajung-zpt-end-game/lib/python/TAL/tests/input/test29.html 2006-05-28 23:09:57 UTC (rev 68318) @@ -1,4 +1,5 @@ div i18n:translate=At the tone the time will be span i18n:data=here/currentTime i18n:translate=timefmt - i18n:name=time2:32 pm/span... beep!/div + i18n:name=time + tal:omit-tag=2:32 pm/span... beep!/div Modified: Zope/branches/ajung-zpt-end-game/lib/python/TAL/tests/output/test29.html === --- Zope/branches/ajung-zpt-end-game/lib/python/TAL/tests/output/test29.html 2006-05-28 23:07:07 UTC (rev 68317) +++ Zope/branches/ajung-zpt-end-game/lib/python/TAL/tests/output/test29.html 2006-05-28 23:09:57 UTC (rev 68318) @@ -1 +1 @@ -divAT THE TONE THE TIME WILL BE 59 MINUTES AFTER 6 PM... BEEP!/div +divAT THE TONE THE TIME WILL BE 59 minutes after 6 PM... BEEP!/div ___ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/ajung-zpt-end-game/lib/python/TAL/tests/output/test_metal Cope with changes in the METAL interpreter
Log message for revision 68320: Cope with changes in the METAL interpreter Changed: U Zope/branches/ajung-zpt-end-game/lib/python/TAL/tests/output/test_metal1.html U Zope/branches/ajung-zpt-end-game/lib/python/TAL/tests/output/test_metal7.html -=- Modified: Zope/branches/ajung-zpt-end-game/lib/python/TAL/tests/output/test_metal1.html === --- Zope/branches/ajung-zpt-end-game/lib/python/TAL/tests/output/test_metal1.html 2006-05-28 23:10:37 UTC (rev 68319) +++ Zope/branches/ajung-zpt-end-game/lib/python/TAL/tests/output/test_metal1.html 2006-05-28 23:11:02 UTC (rev 68320) @@ -22,7 +22,7 @@ span metal:use-macro=OUTER2 AAA - xxx metal:fill-slot=OUTERSLOT + xxx spanINNER/span /xxx BBB @@ -48,7 +48,7 @@ span metal:use-macro=OUTER3 AAA - xxx metal:fill-slot=OUTERSLOT + xxx spanINNER xxxINNERSLOT/xxx /span @@ -63,7 +63,7 @@ /span span metal:use-macro=INNER3INNER -xxx metal:fill-slot=INNERSLOTINNERSLOT/xxx +xxxINNERSLOT/xxx /span span metal:use-macro=INNER3INNER Modified: Zope/branches/ajung-zpt-end-game/lib/python/TAL/tests/output/test_metal7.html === --- Zope/branches/ajung-zpt-end-game/lib/python/TAL/tests/output/test_metal7.html 2006-05-28 23:10:37 UTC (rev 68319) +++ Zope/branches/ajung-zpt-end-game/lib/python/TAL/tests/output/test_metal7.html 2006-05-28 23:11:02 UTC (rev 68320) @@ -2,5 +2,5 @@ x metal:define-slot=title / /html html metal:use-macro=page i18n:domain=zope -x metal:fill-slot=title / +x / /html ___ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/branches/ajung-zpt-end-game/lib/python/TAL/tests/test_htmltalparser.py Cope with TAL 1.6 bytecode changes:
Log message for revision 68321:
Cope with TAL 1.6 bytecode changes:
* tal:replace now emits something different (optTag)
* constructs with i18n:name emits more complicated bytecode (i18nVariable,
etc.)
to cope with behavioural changes (see
http://zope.org/Collectors/Zope3-dev/301)
* probably some more that aren't very interesting (if these any of this is
interesting at all)
Changed:
U
Zope/branches/ajung-zpt-end-game/lib/python/TAL/tests/test_htmltalparser.py
-=-
Modified:
Zope/branches/ajung-zpt-end-game/lib/python/TAL/tests/test_htmltalparser.py
===
--- Zope/branches/ajung-zpt-end-game/lib/python/TAL/tests/test_htmltalparser.py
2006-05-28 23:11:02 UTC (rev 68320)
+++ Zope/branches/ajung-zpt-end-game/lib/python/TAL/tests/test_htmltalparser.py
2006-05-28 23:14:22 UTC (rev 68321)
@@ -345,9 +345,13 @@
self._run_check(p tal:replace='string:foo'bar/p, [
('setPosition', (1, 0)),
('beginScope', {'tal:replace': 'string:foo'}),
- ('insertText', ('$string:foo$',
- [('startTag', ('p', [('tal:replace', 'string:foo', 'tal')])),
- rawtext('bar/p')])),
+ ('optTag',
+ ('p',
+ '',
+ None,
+ 0,
+ [('startTag', ('p', [('tal:replace', 'string:foo', 'tal')]))],
+ [('insertText', ('$string:foo$', [rawtext('bar')]))])),
('endScope', ()),
])
@@ -355,10 +359,13 @@
self._run_check(p tal:replace='text string:foo'bar/p, [
('setPosition', (1, 0)),
('beginScope', {'tal:replace': 'text string:foo'}),
- ('insertText', ('$string:foo$',
- [('startTag', ('p',
- [('tal:replace', 'text string:foo', 'tal')])),
- rawtext('bar/p')])),
+ ('optTag',
+ ('p',
+ '',
+ None,
+ 0,
+ [('startTag', ('p', [('tal:replace', 'text string:foo',
'tal')]))],
+ [('insertText', ('$string:foo$', [('rawtextOffset', ('bar',
3))]))])),
('endScope', ()),
])
@@ -366,10 +373,14 @@
self._run_check(p tal:replace='structure string:br'bar/p, [
('setPosition', (1, 0)),
('beginScope', {'tal:replace': 'structure string:br'}),
- ('insertStructure', ('$string:br$', {},
- [('startTag', ('p',
-[('tal:replace', 'structure string:br', 'tal')])),
- rawtext('bar/p')])),
+ ('optTag',
+ ('p',
+ '',
+ None,
+ 0,
+ [('startTag', ('p', [('tal:replace', 'structure string:br',
'tal')]))],
+ [('insertStructure',
+ ('$string:br$', {}, [('rawtextOffset', ('bar', 3))]))])),
('endScope', ()),
])
@@ -383,9 +394,13 @@
[('tal:repeat', 'x python:(1,2,3)', 'tal')])),
('setPosition', (1, 33)),
('beginScope', {'tal:replace': 'x'}),
- ('insertText', ('$x$',
-[('startTag', ('span', [('tal:replace', 'x', 'tal')])),
- rawtext('dummy/span')])),
+ ('optTag',
+('span',
+ '',
+ None,
+ 0,
+ [('startTag', ('span', [('tal:replace', 'x',
'tal')]))],
+ [('insertText', ('$x$', [rawtext('dummy')]))])),
('endScope', ()),
rawtext('/p')])),
('endScope', ()),
@@ -416,14 +431,19 @@
('beginScope',
{'tal:attributes': 'src string:foo.png',
'tal:replace': 'structure string:img'}),
-('insertStructure',
- ('$string:img$',
- {'src': ('$string:foo.png$', 0, None)},
- [('startTag', ('p',
- [('tal:replace', 'structure string:img', 'tal'),
- ('tal:attributes', 'src string:foo.png',
- 'tal')])),
- rawtext('duh/p')])),
+('optTag',
+ ('p',
+ '',
+ None,
+ 0,
+ [('startTag',
+('p',
+ [('tal:replace', 'structure string:img', 'tal'),
+ ('tal:attributes', 'src string:foo.png', 'tal')]))],
+ [('insertStructure',
+('$string:img$',
+ {'src': ('$string:foo.png$', False, None)},
+ [rawtext('duh')]))])),
('endScope', ()),
])
@@ -454,11 +474,16 @@
('beginScope',
{'tal:replace': 'notHere', 'tal:on-error': 'string:error'}),
('onError',
- ([('insertText', ('$notHere$',
-
[Zope-Checkins] SVN: Zope/branches/ajung-zpt-end-game/lib/python/ Update to latest Zope 3.3 branch; it contains a traversing bugfix.
Log message for revision 68327: Update to latest Zope 3.3 branch; it contains a traversing bugfix. Changed: _U Zope/branches/ajung-zpt-end-game/lib/python/ _U Zope/branches/ajung-zpt-end-game/lib/python/zope/ -=- Property changes on: Zope/branches/ajung-zpt-end-game/lib/python ___ Name: svn:externals - ZConfigsvn://svn.zope.org/repos/main/ZConfig/tags/ZConfig-2.3.1 BTrees -r 68012 svn://svn.zope.org/repos/main/ZODB/branches/3.7/src/BTrees persistent -r 68012 svn://svn.zope.org/repos/main/ZODB/branches/3.7/src/persistent ThreadedAsync -r 68012 svn://svn.zope.org/repos/main/ZODB/branches/3.7/src/ThreadedAsync transaction-r 68012 svn://svn.zope.org/repos/main/ZODB/branches/3.7/src/transaction ZEO-r 68012 svn://svn.zope.org/repos/main/ZODB/branches/3.7/src/ZEO ZODB -r 68012 svn://svn.zope.org/repos/main/ZODB/branches/3.7/src/ZODB ZopeUndo -r 68012 svn://svn.zope.org/repos/main/ZODB/branches/3.7/src/ZopeUndo zdaemon-r 40792 svn://svn.zope.org/repos/main/zdaemon/trunk/src/zdaemon pytz -r 68282 svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/pytz zodbcode -r 68282 svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zodbcode ClientCookie -r 68282 svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/ClientCookie mechanize -r 68282 svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/mechanize docutils svn://svn.zope.org/repos/main/docutils/tags/0.4.0 + ZConfigsvn://svn.zope.org/repos/main/ZConfig/tags/ZConfig-2.3.1 BTrees -r 68012 svn://svn.zope.org/repos/main/ZODB/branches/3.7/src/BTrees persistent -r 68012 svn://svn.zope.org/repos/main/ZODB/branches/3.7/src/persistent ThreadedAsync -r 68012 svn://svn.zope.org/repos/main/ZODB/branches/3.7/src/ThreadedAsync transaction-r 68012 svn://svn.zope.org/repos/main/ZODB/branches/3.7/src/transaction ZEO-r 68012 svn://svn.zope.org/repos/main/ZODB/branches/3.7/src/ZEO ZODB -r 68012 svn://svn.zope.org/repos/main/ZODB/branches/3.7/src/ZODB ZopeUndo -r 68012 svn://svn.zope.org/repos/main/ZODB/branches/3.7/src/ZopeUndo zdaemon-r 40792 svn://svn.zope.org/repos/main/zdaemon/trunk/src/zdaemon pytz -r 68324 svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/pytz zodbcode -r 68324 svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zodbcode ClientCookie -r 68324 svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/ClientCookie mechanize -r 68324 svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/mechanize docutils svn://svn.zope.org/repos/main/docutils/tags/0.4.0 Property changes on: Zope/branches/ajung-zpt-end-game/lib/python/zope ___ Name: svn:externals - app -r 68282 svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app cachedescriptors -r 68282 svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/cachedescriptors component-r 68282 svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/component configuration-r 68282 svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/configuration documenttemplate -r 68282 svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/documenttemplate event-r 68282 svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/event exceptions -r 68282 svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/exceptions hookable -r 68282 svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/hookable i18n -r 68282 svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/i18n i18nmessageid-r 68282 svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/i18nmessageid interface-r 68282 svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/interface modulealias -r 68282 svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/modulealias pagetemplate -r 68282 svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/pagetemplate proxy-r 68282 svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/proxy publisher-r 68282 svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/publisher schema -r 68282 svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/schema security -r 68282 svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/security server -r 68282 svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/server structuredtext -r 68282 svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/structuredtext tal -r 68282 svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/tal tales-r 68282 svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/tales testing -r 67760 svn://svn.zope.org/repos/main/zope.testing/trunk/src/zope/testing thread -r 68282
