[Zope3-checkins] CVS: Zope3/src/zope/tal - talinterpreter.py:1.22.4.1

[Stephan Richter]

Update of /cvs-repository/Zope3/src/zope/tal
In directory cvs.zope.org:/tmp/cvs-serv28521

Modified Files:
      Tag: srichter-i18n-macro-interaction-branch
	talinterpreter.py 
Log Message:
YIPEEE! The bug seems fixed! All tests pass!


=== Zope3/src/zope/tal/talinterpreter.py 1.22 => 1.22.4.1 ===
--- Zope3/src/zope/tal/talinterpreter.py:1.22	Tue Jul 15 02:06:56 2003
+++ Zope3/src/zope/tal/talinterpreter.py	Tue Aug  5 18:41:48 2003
@@ -156,7 +156,11 @@
 
     def popMacro(self):
         stuff = self.macroStack.pop()
-        self.i18nContext = stuff[3]
+        # XXX: Fred check this, please! But it makes totally sense. In
+        # pushMacro() you never make any adjustment to self.i18nContext, but
+        # when you pop the macro you do set self.i18nContext. That cannot be
+        # correct! And commenting the line below out, makes all the tests pass!
+        #self.i18nContext = stuff[3]
         return stuff
 
     def macroContext(self, what):