summaryrefslogtreecommitdiff
path: root/talinterpreter.py
diff options
context:
space:
mode:
authorMarius Gedminas <marius@gedmin.as>2006-08-25 17:05:12 +0000
committerMarius Gedminas <marius@gedmin.as>2006-08-25 17:05:12 +0000
commit925879cef759010ff13fe575849cbabca3dcdacb (patch)
tree062ac63d263da7edc594a6d0584d2f5980b407ed /talinterpreter.py
parent828aa4ad474f1c4c4e18517ca9919c4a15c25caf (diff)
downloadzope-tal-925879cef759010ff13fe575849cbabca3dcdacb.tar.gz
Fixed issue 697: wrong page template referenced in the traceback if an
exception occurs inside fill-slot. Note that it is OK to remove that code in do_defineSlot, because it is redundant: TALGenerator emits a setSourceFile opcode to restore the source file after emitting a defineSlot opcode. Thanks to Fred Drake for sanity checking.
Diffstat (limited to 'talinterpreter.py')
-rw-r--r--talinterpreter.py4
1 files changed, 0 insertions, 4 deletions
diff --git a/talinterpreter.py b/talinterpreter.py
index 5e34e97..9c801bf 100644
--- a/talinterpreter.py
+++ b/talinterpreter.py
@@ -945,13 +945,9 @@ class TALInterpreter(object):
# render the slot filler.
chopped = macs[i:]
del macs[i:]
- prev_source = self.sourceFile
try:
self.interpret(slot)
finally:
- if self.sourceFile != prev_source:
- self.engine.setSourceFile(prev_source)
- self.sourceFile = prev_source
# Restore the stack entries.
for mac in chopped:
mac.entering = False # Not entering