[Zope-Checkins] CVS: Zope/lib/python/TAL - TALInterpreter.py:1.66.2.5

Shane Hathaway shane@cvs.zope.org
Tue, 26 Mar 2002 08:46:20 -0500


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

Modified Files:
      Tag: shane-better-tracebacks-branch
	TALInterpreter.py 
Log Message:
Minor change to correct the Boa debugger.  We need to save the position even if the macro is from the same file.

=== Zope/lib/python/TAL/TALInterpreter.py 1.66.2.4 => 1.66.2.5 ===
         macs = self.macroStack
         if macs and macs[-1] is not None:
+            saved_source = self.sourceFile
+            saved_position = self.position  # Used by Boa Constructor
             macroName, slots = self.popMacro()[:2]
             slot = slots.get(slotName)
             if slot is not None:
-                saved_source = self.sourceFile
-                saved_position = self.position  # Used by Boa Constructor
                 self.interpret(slot)
                 if self.sourceFile != saved_source:
                     self.engine.setSourceFile(saved_source)