[Zope-Checkins] SVN: Zope/trunk/ tal:on-error does not trap ConflictError anymore.

[Florent Guillaume]

Log message for revision 27058:
  tal:on-error does not trap ConflictError anymore.
  
  


Changed:
  U   Zope/trunk/doc/CHANGES.txt
  U   Zope/trunk/lib/python/TAL/TALInterpreter.py


-=-
Modified: Zope/trunk/doc/CHANGES.txt
===================================================================
--- Zope/trunk/doc/CHANGES.txt	2004-08-12 16:16:03 UTC (rev 27057)
+++ Zope/trunk/doc/CHANGES.txt	2004-08-12 16:19:30 UTC (rev 27058)
@@ -144,6 +144,8 @@
 
     Bugs fixed
 
+     - TAL: tal:on-error does not trap ConflictError anymore.
+
      - OFS.CopySupport: Enforced "Delete objects" permission during
        move (CMF Collector #259).
 

Modified: Zope/trunk/lib/python/TAL/TALInterpreter.py
===================================================================
--- Zope/trunk/lib/python/TAL/TALInterpreter.py	2004-08-12 16:16:03 UTC (rev 27057)
+++ Zope/trunk/lib/python/TAL/TALInterpreter.py	2004-08-12 16:19:30 UTC (rev 27058)
@@ -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)