[Zope-Checkins] CVS: Zope/lib/python/TAL - DummyEngine.py:1.32.4.4 ITALES.py:1.2.2.2 TALInterpreter.py:1.69.4.5

[Chris McDonough]

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

Modified Files:
      Tag: chrism-install-branch
	DummyEngine.py ITALES.py TALInterpreter.py 
Log Message:
Merge with HEAD.  Again, sorry for the spew (what's left of it... someone seems to have filtered some of this branch's checkins out).


=== Zope/lib/python/TAL/DummyEngine.py 1.32.4.3 => 1.32.4.4 ===
--- Zope/lib/python/TAL/DummyEngine.py:1.32.4.3	Tue Oct  8 17:45:54 2002
+++ Zope/lib/python/TAL/DummyEngine.py	Sat Oct 26 15:51:46 2002
@@ -62,6 +62,9 @@
     def getCompilerError(self):
         return CompilerError
 
+    def getCompiler(self):
+        return self
+
     def setSourceFile(self, source_file):
         self.source_file = source_file
 


=== Zope/lib/python/TAL/ITALES.py 1.2.2.1 => 1.2.2.2 ===
--- Zope/lib/python/TAL/ITALES.py:1.2.2.1	Sat Sep 28 21:40:35 2002
+++ Zope/lib/python/TAL/ITALES.py	Sat Oct 26 15:51:46 2002
@@ -41,6 +41,9 @@
     ITALESCompiler.compile().
     """
 
+    def getCompiler():
+        """Return an object that supports ITALESCompiler."""
+
     def getDefault():
         """Return the value of the 'default' TALES expression.
 


=== Zope/lib/python/TAL/TALInterpreter.py 1.69.4.4 => 1.69.4.5 ===
--- Zope/lib/python/TAL/TALInterpreter.py:1.69.4.4	Tue Oct  8 17:45:54 2002
+++ Zope/lib/python/TAL/TALInterpreter.py	Sat Oct 26 15:51:46 2002
@@ -594,7 +594,7 @@
 
     def insertHTMLStructure(self, text, repldict):
         from HTMLTALParser import HTMLTALParser
-        gen = AltTALGenerator(repldict, self.engine, 0)
+        gen = AltTALGenerator(repldict, self.engine.getCompiler(), 0)
         p = HTMLTALParser(gen) # Raises an exception if text is invalid
         p.parseString(text)
         program, macros = p.getCode()
@@ -602,7 +602,7 @@
 
     def insertXMLStructure(self, text, repldict):
         from TALParser import TALParser
-        gen = AltTALGenerator(repldict, self.engine, 0)
+        gen = AltTALGenerator(repldict, self.engine.getCompiler(), 0)
         p = TALParser(gen)
         gen.enable(0)
         p.parseFragment('<!DOCTYPE foo PUBLIC "foo" "bar"><foo>')