[Lxml-checkins] r44196 - lxml/branch/lxml-1.3/src/lxml

[scoder at codespeak.net]

Author: scoder
Date: Tue Jun 12 19:32:03 2007
New Revision: 44196

Modified:
   lxml/branch/lxml-1.3/src/lxml/etree.pyx
Log:
merged in rev 43695 from trunk

Modified: lxml/branch/lxml-1.3/src/lxml/etree.pyx
==============================================================================
--- lxml/branch/lxml-1.3/src/lxml/etree.pyx	(original)
+++ lxml/branch/lxml-1.3/src/lxml/etree.pyx	Tue Jun 12 19:32:03 2007
@@ -1220,6 +1220,8 @@
             if self._context_node is not None and \
                    self._context_node._doc is not None:
                 return self._context_node._doc._parser
+            if self._doc is not None:
+                return self._doc._parser
             return None
 
     def write(self, file, encoding=None,
@@ -1299,7 +1301,6 @@
             path = "." + path
         return root.findall(path)
     
-    # extensions to ElementTree API
     def xpath(self, _path, namespaces=None, extensions=None, **_variables):
         """XPath evaluate in context of document.
 
@@ -1376,7 +1377,8 @@
         There is support for loading files through the file system, HTTP and
         FTP.
 
-        Note that XInclude does not support custom resolvers in Python space.
+        Note that XInclude does not support custom resolvers in Python space
+        due to restrictions of libxml2 <= 2.6.28.
         """
         cdef python.PyThreadState* state
         cdef int result