[Lxml-checkins] r39477 - lxml/trunk/src/lxml

[scoder at codespeak.net]

Author: scoder
Date: Tue Feb 27 08:37:43 2007
New Revision: 39477

Modified:
   lxml/trunk/src/lxml/xslt.pxi
Log:
cleanup in XSLT URL resolving

Modified: lxml/trunk/src/lxml/xslt.pxi
==============================================================================
--- lxml/trunk/src/lxml/xslt.pxi	(original)
+++ lxml/trunk/src/lxml/xslt.pxi	Tue Feb 27 08:37:43 2007
@@ -70,21 +70,21 @@
 
         c_doc = NULL
         if doc_ref is not None:
-            if doc_ref._type == PARSER_DATA_EMPTY:
-                c_doc = _newDoc()
             if doc_ref._type == PARSER_DATA_STRING:
                 c_doc = _internalParseDoc(
                     _cstr(doc_ref._data_bytes), parse_options,
                     resolver_context)
+            elif doc_ref._type == PARSER_DATA_FILENAME:
+                c_doc = _internalParseDocFromFile(
+                    _cstr(doc_ref._data_bytes), parse_options,
+                    resolver_context)
             elif doc_ref._type == PARSER_DATA_FILE:
                 data = doc_ref._file.read()
                 c_doc = _internalParseDoc(
                     _cstr(data), parse_options,
                     resolver_context)
-            elif doc_ref._type == PARSER_DATA_FILENAME:
-                c_doc = _internalParseDocFromFile(
-                    _cstr(doc_ref._data_bytes), parse_options,
-                    resolver_context)
+            elif doc_ref._type == PARSER_DATA_EMPTY:
+                c_doc = _newDoc()
             if c_doc is not NULL and c_doc.URL is NULL:
                 c_doc.URL = tree.xmlStrdup(c_uri)
         return c_doc