From fg at nuxeo.com  Thu Aug 12 12:15:15 2004
From: fg at nuxeo.com (Florent Guillaume)
Date: Sun Aug 10 17:05:20 2008
Subject: [ZPT-CVS] CVS: Packages/TAL - TALInterpreter.py:1.78.4.7
Message-ID: <20040812161515.457572030A0@mail.zope.org>

Update of /cvs-repository/Packages/TAL
In directory cvs.zope.org:/tmp/cvs-serv29542/lib/python/TAL

Modified Files:
      Tag: Zope-2_7-branch
	TALInterpreter.py 
Log Message:
tal:on-error does not trap ConflictError anymore.


=== Packages/TAL/TALInterpreter.py 1.78.4.6 => 1.78.4.7 ===
--- Packages/TAL/TALInterpreter.py:1.78.4.6	Tue Jul 13 14:15:05 2004
+++ Packages/TAL/TALInterpreter.py	Thu Aug 12 12:15:14 2004
@@ -23,6 +23,7 @@
 # Do not use cStringIO here!  It's not unicode aware. :(
 from StringIO import StringIO
 from DocumentTemplate.DT_Util import ustr
+from ZODB.POSException import ConflictError
 
 from TALDefs import TAL_VERSION, TALError, METALError, attrEscape
 from TALDefs import isCurrentVersion, getProgramVersion, getProgramMode
@@ -710,6 +711,8 @@
         self._stream_write = stream.write
         try:
             self.interpret(block)
+        except ConflictError:
+            raise
         except:
             exc = sys.exc_info()[1]
             self.restoreState(state)