Author: scoder
Date: Fri Apr 21 16:37:26 2006
New Revision: 26105
Modified:
lxml/branch/resolver-new/src/lxml/xslt.pxi
Log:
clean up
Modified: lxml/branch/resolver-new/src/lxml/xslt.pxi
==============================================================================
--- lxml/branch/resolver-new/src/lxml/xslt.pxi (original)
+++ lxml/branch/resolver-new/src/lxml/xslt.pxi Fri Apr 21 16:37:26 2006
@@ -392,9 +392,6 @@
################################################################################
# XSLT document loaders
-cdef xslt.xsltDocLoaderFunc __xsltDocDefaultLoader
-__xsltDocDefaultLoader = xslt.xsltDocDefaultLoader
-
cdef xmlDoc* _doc_loader(char* c_uri, tree.xmlDict* c_dict, int c_options,
void* c_ctxt, xslt.xsltLoadType c_type):
cdef xslt.xsltTransformContext* transform_ctxt
@@ -419,7 +416,8 @@
# try default loader first to take advantage of libxslt's doc reuse
if tree.strncmp(c_uri, "py:", 3) != 0:
- c_doc = __xsltDocDefaultLoader(c_uri, c_dict, c_options, c_ctxt,
c_type)
+ c_doc = XSLT_DOC_DEFAULT_LOADER(
+ c_uri, c_dict, c_options, c_ctxt, c_type)
if c_doc is not NULL:
if c_doc._private is NULL and reference_doc is not None:
c_doc._private = <python.PyObject*>reference_doc
@@ -449,11 +447,15 @@
reference_doc._parser)
if c_doc is NULL:
- c_doc = __xsltDocDefaultLoader(c_uri, c_dict, c_options, c_ctxt,
c_type)
+ c_doc = XSLT_DOC_DEFAULT_LOADER(
+ c_uri, c_dict, c_options, c_ctxt, c_type)
if c_doc is not NULL and c_doc._private is NULL and reference_doc is not
None:
c_doc._private = <python.PyObject*>reference_doc
return c_doc
+cdef xslt.xsltDocLoaderFunc XSLT_DOC_DEFAULT_LOADER
+XSLT_DOC_DEFAULT_LOADER = xslt.xsltDocDefaultLoader
+
xslt.xsltSetLoaderFunc(_doc_loader)
|
