[Zope-Checkins] CVS: Zope/lib/python/Products/PageTemplates - Expressions.py:1.36.6.6
Casey Duncan
casey@zope.com
Fri, 20 Sep 2002 16:51:18 -0400
Update of /cvs-repository/Zope/lib/python/Products/PageTemplates
In directory cvs.zope.org:/tmp/cvs-serv18968
Modified Files:
Tag: Zope-2_6-branch
Expressions.py
Log Message:
Move the str call below the tuple expansion so it works correctly with tuple path elements
=== Zope/lib/python/Products/PageTemplates/Expressions.py 1.36.6.5 => 1.36.6.6 ===
--- Zope/lib/python/Products/PageTemplates/Expressions.py:1.36.6.5 Fri Sep 20 15:53:16 2002
+++ Zope/lib/python/Products/PageTemplates/Expressions.py Fri Sep 20 16:51:18 2002
@@ -304,11 +304,13 @@
validate = securityManager.validate
__traceback_info__ = REQUEST
while path:
- name = str(path.pop())
+ name = path.pop()
if isinstance(name, TupleType):
object = object(*name)
continue
+
+ name = str(name)
if name[0] == '_':
# Never allowed in a URL.