[Lxml-checkins] r53792 - in lxml/branch/lxml-2.0: . src/lxml

[scoder at codespeak.net]

Author: scoder
Date: Tue Apr 15 19:56:28 2008
New Revision: 53792

Modified:
   lxml/branch/lxml-2.0/CHANGES.txt
   lxml/branch/lxml-2.0/src/lxml/parser.pxi
Log:
trunk merge -c 53791: custom resolver fix

Modified: lxml/branch/lxml-2.0/CHANGES.txt
==============================================================================
--- lxml/branch/lxml-2.0/CHANGES.txt	(original)
+++ lxml/branch/lxml-2.0/CHANGES.txt	Tue Apr 15 19:56:28 2008
@@ -11,6 +11,8 @@
 Bugs fixed
 ----------
 
+* Resolving to a filename in custom resolvers didn't work.
+
 * Memory leak in Schematron with libxml2 >= 2.6.31.
 
 Other changes

Modified: lxml/branch/lxml-2.0/src/lxml/parser.pxi
==============================================================================
--- lxml/branch/lxml-2.0/src/lxml/parser.pxi	(original)
+++ lxml/branch/lxml-2.0/src/lxml/parser.pxi	Tue Apr 15 19:56:28 2008
@@ -333,7 +333,7 @@
             c_context, _cstr(data))
     elif doc_ref._type == PARSER_DATA_FILENAME:
         c_input = xmlparser.xmlNewInputFromFile(
-            c_context, _cstr(doc_ref._data_bytes))
+            c_context, _cstr(doc_ref._filename))
     elif doc_ref._type == PARSER_DATA_FILE:
         file_context = _FileReaderContext(doc_ref._file, context, url)
         c_input = file_context._createParserInput(c_context)