[4suite-checkins] In 4Suite/Ft/Xml/Xslt, files BuiltInExtElements.py, XsltContext.py

[Jeremy Kloth]

Modified Files:
    BuiltInExtElements.py XsltContext.py

Log Message:
Forward port changes from XML1_0-maint.
Updated XML1_0-maint-merge tag

ViewCVS diff:
  http://cvs.4suite.org/viewcvs/4Suite/Ft/Xml/Xslt/BuiltInExtElements.py.diff?r1=1.55&r2=1.56
ViewCVS view:
  http://cvs.4suite.org/viewcvs/4Suite/Ft/Xml/Xslt/BuiltInExtElements.py?rev=1.56&content-type=text/vnd.viewcvs-markup

Index: BuiltInExtElements.py
===================================================================
RCS file: /var/local/cvsroot/4Suite/Ft/Xml/Xslt/BuiltInExtElements.py,v
retrieving revision 1.55
retrieving revision 1.56
diff -U2 -r1.55 -r1.56
--- BuiltInExtElements.py	10 Dec 2005 19:53:09 -0000	1.55
+++ BuiltInExtElements.py	20 Dec 2006 00:57:10 -0000	1.56
@@ -133,5 +133,5 @@
 
         processor.addHandler(self._output_parameters,
-                             processor.writers[-1].getStream())
+                             processor.writer.getStream())
         try:
             for child in self.children:
@@ -269,5 +269,5 @@
             processor.xslMessage(repr(xkeys))
         else:
-            writer = processor.writers[-1]
+            writer = processor.writer
             writer.startElement(u'zz:KeyDump', RESERVED_NAMESPACE)
             for k, v in xkeys.items():
@@ -279,5 +279,5 @@
                     for node in vv:
                         if node.nodeType == Node.ATTRIBUTE_NODE:
-                            processor.writers[-1].comment(
+                            processor.writer.comment(
                                 u"Attribute: %s=%s"%(node.nodeName, node.value))
                         else:
@@ -325,5 +325,5 @@
             from Ft.Xml.XPath.XPathTypes import g_xpathPrimitiveTypes
             from Ft.Xml.Xslt.CopyOfElement import CopyNode
-            writer = processor.writers[-1]
+            writer = processor.writer
             writer.startElement(u'zz:VarDump', RESERVED_NAMESPACE)
             for k, v in context.varBindings.items():
@@ -336,5 +336,5 @@
                     for node in v:
                         if node.nodeType == Node.ATTRIBUTE_NODE:
-                            processor.writers[-1].comment(
+                            processor.writer.comment(
                                 u"Attribute: %s=%s"%(node.nodeName, node.value))
                         else:
@@ -373,5 +373,5 @@
         string_ = Conversions.StringValue(value)
         substring = Conversions.StringValue(self._substring.evaluate(context))
-        writer = processor.writers[-1]
+        writer = processor.writer
         for chunk in string_.split(substring):
             writer.text(chunk)
@@ -464,5 +464,5 @@
 
     def instantiate(self, context, processor):
-        processor.writers[-1].text(self._select.evaluate(context), escapeOutput=False)
+        processor.writer.text(self._select.evaluate(context), escapeOutput=False)
         return
 
ViewCVS diff:
  http://cvs.4suite.org/viewcvs/4Suite/Ft/Xml/Xslt/XsltContext.py.diff?r1=1.15&r2=1.16
ViewCVS view:
  http://cvs.4suite.org/viewcvs/4Suite/Ft/Xml/Xslt/XsltContext.py?rev=1.16&content-type=text/vnd.viewcvs-markup

Index: XsltContext.py
===================================================================
RCS file: /var/local/cvsroot/4Suite/Ft/Xml/Xslt/XsltContext.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -U2 -r1.15 -r1.16
--- XsltContext.py	27 Nov 2006 16:29:29 -0000	1.15
+++ XsltContext.py	20 Dec 2006 00:57:10 -0000	1.16
@@ -67,13 +67,15 @@
 
     def clone(self):
-        return self.__class__(node=self.node,
-                              position=self.position,
-                              size=self.size,
-                              currentNode=self.currentNode,
-                              varBindings=self.varBindings.copy(),
-                              processorNss=self.processorNss,
-                              stylesheet=self.stylesheet,
-                              processor=self.processor,
-                              mode=self.mode)
+        context = self.__class__(node=self.node,
+                                 position=self.position,
+                                 size=self.size,
+                                 currentNode=self.currentNode,
+                                 varBindings=self.varBindings.copy(),
+                                 processorNss=self.processorNss,
+                                 stylesheet=self.stylesheet,
+                                 processor=self.processor,
+                                 mode=self.mode)
+        context.functions = self.functions
+        return context
 
     def __repr__(self):