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

[Fred L. Drake, Jr.]

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

Modified Files:
	talinterpreter.py 
Log Message:
- clean up popMacro() a little
- remove unused methods macroContext() and dumpMacroStack(); these no
  longer reflect the structure of the macroStack structure properly
  and could not be useful (and macroContext() wasn't used anyway)


=== Zope3/src/zope/tal/talinterpreter.py 1.24 => 1.25 ===
--- Zope3/src/zope/tal/talinterpreter.py:1.24	Wed Aug  6 11:07:26 2003
+++ Zope3/src/zope/tal/talinterpreter.py	Wed Aug  6 11:12:41 2003
@@ -154,17 +154,7 @@
         self.macroStack.append([macroName, slots, entering, self.i18nContext])
 
     def popMacro(self):
-        stuff = self.macroStack.pop()
-        return stuff
-
-    def macroContext(self, what):
-        macroStack = self.macroStack
-        i = len(macroStack)
-        while i > 0:
-            i = i-1
-            if macroStack[i][0] == what:
-                return i
-        return -1
+        return self.macroStack.pop()
 
     def __call__(self):
         assert self.level == 0
@@ -385,14 +375,6 @@
         else:
             self.do_optTag(stuff)
     bytecode_handlers["optTag"] = do_optTag
-
-    def dumpMacroStack(self, prefix, suffix, value):
-        sys.stderr.write("+---- %s%s = %s\n" % (prefix, suffix, value))
-        for i in range(len(self.macroStack)):
-            what, macroName, slots = self.macroStack[i][:3]
-            sys.stderr.write("| %2d. %-12s %-12s %s\n" %
-                             (i, what, macroName, slots and slots.keys()))
-        sys.stderr.write("+--------------------------------------\n")
 
     def do_rawtextBeginScope(self, (s, col, position, closeprev, dict)):
         self._stream_write(s)