Merge pull request #198 from mvantellingen/feature/fix-resolver-base-url

Fix setting the base url for etree.Resolver.resolve_string
lxml · Jul 18, 2016 · 989a253 · 989a253
2 parents eb88652 + a4437df
commit 989a253
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/src/lxml/includes/xmlparser.pxd b/src/lxml/includes/xmlparser.pxd
@@ -56,6 +56,7 @@ cdef extern from "libxml/tree.h":
         const_xmlChar* base
         const_xmlChar* cur
         const_xmlChar* end
+        const_char *filename
 
     ctypedef struct xmlParserInputBuffer:
         void* context

diff --git a/src/lxml/parser.pxi b/src/lxml/parser.pxi
@@ -447,6 +447,8 @@ cdef xmlparser.xmlParserInput* _local_resolver(const_char* c_url, const_char* c_
             data = doc_ref._data_bytes
             c_input = xmlparser.xmlNewInputStream(c_context)
             if c_input is not NULL:
+                if doc_ref._filename:
+                    c_input.filename = <char *>tree.xmlStrdup(_xcstr(doc_ref._filename))
                 c_input.base = _xcstr(data)
                 c_input.length = python.PyBytes_GET_SIZE(data)
                 c_input.cur = c_input.base