[ZPT] CVS: Releases/Zope/lib/python/Products/PageTemplates - Expressions.py:1.33

Evan Simpson evan@cvs.zope.org
Mon, 4 Mar 2002 12:17:00 -0500


Update of /cvs-repository/Releases/Zope/lib/python/Products/PageTemplates
In directory cvs.zope.org:/tmp/cvs-serv20816

Modified Files:
	Expressions.py 
Log Message:
Fix StringExpr regex

=== Releases/Zope/lib/python/Products/PageTemplates/Expressions.py 1.32 => 1.33 ===
 
             
-_interp = re.compile(r'\$(%(n)s)|\${(%(n)s(?:/%(n)s)*)}' % {'n': NAME_RE})
+_interp = re.compile(r'\$(%(n)s)|\${(%(n)s(?:/[^}]*)*)}' % {'n': NAME_RE})
 
 class StringExpr:
     def __init__(self, name, expr, engine):