[ZPT] CVS: Packages/Products/PageTemplates (Products/DC/PageTemplates) - Expressions.py:1.17

evan@serenade.digicool.com evan@serenade.digicool.com
Wed, 13 Jun 2001 10:45:12 -0400


Update of /cvs-repository/Packages/Products/PageTemplates
In directory serenade:/home/evan/Zope/pt/lib/python/Products/PageTemplates

Modified Files:
	Expressions.py 
Log Message:
Make string expressions exception-aware.



--- Updated File Expressions.py in package Packages/Products/PageTemplates --
--- Expressions.py	2001/06/08 20:59:26	1.16
+++ Expressions.py	2001/06/13 14:45:12	1.17
@@ -254,7 +254,10 @@
     def __call__(self, econtext):
         vvals = []
         for var in self._vars:
-            vvals.append(var(econtext))
+            v = var(econtext)
+            if isinstance(v, Exception):
+                raise v
+            vvals.append(v)
         return self._expr % tuple(vvals)
 
     def __str__(self):