[Lxml-checkins] r44193 - in lxml/branch/lxml-1.3: . src/lxml

[scoder at codespeak.net]

Author: scoder
Date: Tue Jun 12 19:26:48 2007
New Revision: 44193

Modified:
   lxml/branch/lxml-1.3/CHANGES.txt
   lxml/branch/lxml-1.3/src/lxml/xslt.pxi
Log:
merged in bug fix from trunk rev 43574

Modified: lxml/branch/lxml-1.3/CHANGES.txt
==============================================================================
--- lxml/branch/lxml-1.3/CHANGES.txt	(original)
+++ lxml/branch/lxml-1.3/CHANGES.txt	Tue Jun 12 19:26:48 2007
@@ -22,6 +22,8 @@
 Bugs fixed
 ----------
 
+* XSLT parsing failed to pass resolver context on to imported documents
+
 * More ET compatible behaviour when writing out XML declarations or not
 
 * ``Element.attrib`` was missing ``clear()`` method

Modified: lxml/branch/lxml-1.3/src/lxml/xslt.pxi
==============================================================================
--- lxml/branch/lxml-1.3/src/lxml/xslt.pxi	(original)
+++ lxml/branch/lxml-1.3/src/lxml/xslt.pxi	Tue Jun 12 19:26:48 2007
@@ -131,6 +131,8 @@
     c_doc = _xslt_resolve_stylesheet(c_uri, c_pcontext)
     if c_doc is not NULL:
         python.PyGILState_Release(gil_state)
+        if c_type == xslt.XSLT_LOAD_STYLESHEET:
+            c_doc._private = c_pcontext
         return c_doc
 
     c_doc = _xslt_resolve_from_python(c_uri, c_pcontext, parse_options, &error)
@@ -141,6 +143,8 @@
             _xslt_store_resolver_exception(c_uri, c_pcontext, c_type)
 
     python.PyGILState_Release(gil_state)
+    if c_doc is not NULL and c_type == xslt.XSLT_LOAD_STYLESHEET:
+        c_doc._private = c_pcontext
     return c_doc
 
 cdef xslt.xsltDocLoaderFunc XSLT_DOC_DEFAULT_LOADER