use absolute imports in .pxd files to prevent interference with an installed lxml package

11 files changed, 28 insertions, 28 deletions

diff --git a/src/lxml/includes/c14n.pxd b/src/lxml/includes/c14n.pxd
index 0f6a985d..103f05b3 100644
--- a/src/lxml/includes/c14n.pxd
+++ b/src/lxml/includes/c14n.pxd
@@ -1,6 +1,6 @@
-from tree cimport xmlDoc, xmlOutputBuffer, xmlChar
-from xpath cimport xmlNodeSet
-    
+from lxml.includes.tree cimport xmlDoc, xmlOutputBuffer, xmlChar
+from lxml.includes.xpath cimport xmlNodeSet
+
 cdef extern from "libxml/c14n.h":
     cdef int xmlC14NDocDumpMemory(xmlDoc* doc,
                                   xmlNodeSet* nodes,
diff --git a/src/lxml/includes/dtdvalid.pxd b/src/lxml/includes/dtdvalid.pxd
index abd388e2..5616b3db 100644
--- a/src/lxml/includes/dtdvalid.pxd
+++ b/src/lxml/includes/dtdvalid.pxd
@@ -1,5 +1,5 @@
-cimport tree
-from tree cimport xmlDoc, xmlDtd
+from lxml.includes cimport tree
+from lxml.includes.tree cimport xmlDoc, xmlDtd
 
 cdef extern from "libxml/valid.h":
     ctypedef struct xmlValidCtxt
diff --git a/src/lxml/includes/etreepublic.pxd b/src/lxml/includes/etreepublic.pxd
index eedf4008..125b2ed3 100644
--- a/src/lxml/includes/etreepublic.pxd
+++ b/src/lxml/includes/etreepublic.pxd
@@ -1,7 +1,7 @@
 # public Cython/C interface to lxml.etree
 
-cimport tree
-from tree cimport const_xmlChar
+from lxml.includes cimport tree
+from lxml.includes.tree cimport const_xmlChar
 
 cdef extern from "lxml-version.h":
     cdef char* LXML_VERSION_STRING
diff --git a/src/lxml/includes/htmlparser.pxd b/src/lxml/includes/htmlparser.pxd
index 1fd71602..6ae00bba 100644
--- a/src/lxml/includes/htmlparser.pxd
+++ b/src/lxml/includes/htmlparser.pxd
@@ -1,7 +1,7 @@
-from tree cimport xmlDoc, xmlDict
-from tree cimport xmlInputReadCallback, xmlInputCloseCallback
-from xmlparser cimport xmlParserCtxt, xmlSAXHandler, xmlSAXHandlerV1
-from xmlerror cimport xmlError
+from lxml.includes.tree cimport xmlDoc, xmlDict
+from lxml.includes.tree cimport xmlInputReadCallback, xmlInputCloseCallback
+from lxml.includes.xmlparser cimport xmlParserCtxt, xmlSAXHandler, xmlSAXHandlerV1
+from lxml.includes.xmlerror cimport xmlError
 
 cdef extern from "libxml/HTMLparser.h":
     ctypedef enum htmlParserOption:
diff --git a/src/lxml/includes/relaxng.pxd b/src/lxml/includes/relaxng.pxd
index 468fac6d..6acad532 100644
--- a/src/lxml/includes/relaxng.pxd
+++ b/src/lxml/includes/relaxng.pxd
@@ -1,6 +1,6 @@
-cimport tree
-from tree cimport xmlDoc
-from xmlerror cimport xmlStructuredErrorFunc
+from lxml.includes cimport tree
+from lxml.includes.tree cimport xmlDoc
+from lxml.includes.xmlerror cimport xmlStructuredErrorFunc
 
 cdef extern from "libxml/relaxng.h":
     ctypedef struct xmlRelaxNG
diff --git a/src/lxml/includes/schematron.pxd b/src/lxml/includes/schematron.pxd
index ac7d17ab..5676896d 100644
--- a/src/lxml/includes/schematron.pxd
+++ b/src/lxml/includes/schematron.pxd
@@ -1,5 +1,5 @@
-cimport tree, xmlerror
-from tree cimport xmlDoc, xmlDtd
+from lxml.includes cimport tree, xmlerror
+from lxml.includes.tree cimport xmlDoc, xmlDtd
 
 cdef extern from "libxml/schematron.h":
     ctypedef struct xmlSchematron
diff --git a/src/lxml/includes/xinclude.pxd b/src/lxml/includes/xinclude.pxd
index 22e49f9c..fe622b2d 100644
--- a/src/lxml/includes/xinclude.pxd
+++ b/src/lxml/includes/xinclude.pxd
@@ -1,4 +1,4 @@
-from tree cimport xmlDoc, xmlNode
+from lxml.includes.tree cimport xmlDoc, xmlNode
 
 cdef extern from "libxml/xinclude.h":
 
diff --git a/src/lxml/includes/xmlparser.pxd b/src/lxml/includes/xmlparser.pxd
index dc73dd23..a1d371d6 100644
--- a/src/lxml/includes/xmlparser.pxd
+++ b/src/lxml/includes/xmlparser.pxd
@@ -1,8 +1,8 @@
 from libc.string cimport const_char
 
-from tree cimport xmlDoc, xmlNode, xmlDict, xmlDtd, const_xmlChar
-from tree cimport xmlInputReadCallback, xmlInputCloseCallback
-from xmlerror cimport xmlError, xmlStructuredErrorFunc
+from lxml.includes.tree cimport xmlDoc, xmlNode, xmlDict, xmlDtd, const_xmlChar
+from lxml.includes.tree cimport xmlInputReadCallback, xmlInputCloseCallback
+from lxml.includes.xmlerror cimport xmlError, xmlStructuredErrorFunc
 
 
 cdef extern from "libxml/parser.h":
diff --git a/src/lxml/includes/xmlschema.pxd b/src/lxml/includes/xmlschema.pxd
index 1526a369..8e93cc57 100644
--- a/src/lxml/includes/xmlschema.pxd
+++ b/src/lxml/includes/xmlschema.pxd
@@ -1,6 +1,6 @@
-from tree cimport xmlDoc
-from xmlparser cimport xmlSAXHandler
-from xmlerror cimport xmlStructuredErrorFunc
+from lxml.includes.tree cimport xmlDoc
+from lxml.includes.xmlparser cimport xmlSAXHandler
+from lxml.includes.xmlerror cimport xmlStructuredErrorFunc
 
 cdef extern from "libxml/xmlschemas.h":
     ctypedef struct xmlSchema
diff --git a/src/lxml/includes/xpath.pxd b/src/lxml/includes/xpath.pxd
index 346fb2c3..d01735b6 100644
--- a/src/lxml/includes/xpath.pxd
+++ b/src/lxml/includes/xpath.pxd
@@ -1,8 +1,8 @@
-cimport tree
-cimport xmlerror
+from lxml.includes cimport tree
+from lxml.includes cimport xmlerror
 
 from libc.string cimport const_char
-from tree cimport xmlChar, const_xmlChar
+from lxml.includes.tree cimport xmlChar, const_xmlChar
 
 cdef extern from "libxml/xpath.h":
     ctypedef enum xmlXPathObjectType:
diff --git a/src/lxml/includes/xslt.pxd b/src/lxml/includes/xslt.pxd
index bd3e112b..b39315a9 100644
--- a/src/lxml/includes/xslt.pxd
+++ b/src/lxml/includes/xslt.pxd
@@ -1,5 +1,5 @@
-from tree cimport xmlDoc, xmlNode, xmlDict, xmlChar, const_xmlChar
-from xpath cimport xmlXPathContext, xmlXPathFunction
+from lxml.includes.tree cimport xmlDoc, xmlNode, xmlDict, xmlChar, const_xmlChar
+from lxml.includes.xpath cimport xmlXPathContext, xmlXPathFunction
 
 from libc.string cimport const_char