[Lxml-checkins] r32719 - in lxml/trunk: . src/lxml

[scoder at codespeak.net]

Author: scoder
Date: Fri Sep 29 08:58:12 2006
New Revision: 32719

Modified:
   lxml/trunk/CHANGES.txt
   lxml/trunk/src/lxml/etree.pyx
   lxml/trunk/src/lxml/xinclude.pxd
Log:
reuse parser options for xinclude

Modified: lxml/trunk/CHANGES.txt
==============================================================================
--- lxml/trunk/CHANGES.txt	(original)
+++ lxml/trunk/CHANGES.txt	Fri Sep 29 08:58:12 2006
@@ -8,6 +8,8 @@
 Features added
 --------------
 
+* Reuse original parser flags for XInclude
+
 * Simplified support for handling XSLT processing instructions
 
 Bugs fixed

Modified: lxml/trunk/src/lxml/etree.pyx
==============================================================================
--- lxml/trunk/src/lxml/etree.pyx	(original)
+++ lxml/trunk/src/lxml/etree.pyx	Fri Sep 29 08:58:12 2006
@@ -604,7 +604,13 @@
         # typed as elements.  The included fragment is added between the two,
         # i.e. as a sibling, which does not conflict with traversal.
         self._assertHasRoot()
-        result = xinclude.xmlXIncludeProcessTree(self._context_node._c_node)
+        if self._context_node._doc._parser != None:
+            result = xinclude.xmlXIncludeProcessTreeFlags(
+                self._context_node._c_node,
+                self._context_node._doc._parser._parse_options)
+        else:
+            result = xinclude.xmlXIncludeProcessTree(
+                self._context_node._c_node)
         if result == -1:
             raise XIncludeError, "XInclude processing failed"
 

Modified: lxml/trunk/src/lxml/xinclude.pxd
==============================================================================
--- lxml/trunk/src/lxml/xinclude.pxd	(original)
+++ lxml/trunk/src/lxml/xinclude.pxd	Fri Sep 29 08:58:12 2006
@@ -3,5 +3,7 @@
 cdef extern from "libxml/xinclude.h":
     
     cdef int xmlXIncludeProcess(xmlDoc* doc)
+    cdef int xmlXIncludeProcessFlags(xmlDoc* doc, int parser_opts)
     cdef int xmlXIncludeProcessTree(xmlNode* doc)
+    cdef int xmlXIncludeProcessTreeFlags(xmlNode* doc, int parser_opts)