lxml 5.4.0__cp310-cp310-macosx_10_9_universal2.whl → 6.0.0__cp310-cp310-macosx_10_9_universal2.whl

lxml/includes/libxml/xmlversion.h

@@ -15,21 +15,21 @@
  *
  * the version string like "1.2.3"
  */
-#define LIBXML_DOTTED_VERSION "2.13.8"
+#define LIBXML_DOTTED_VERSION "2.14.4"
 
 /**
  * LIBXML_VERSION:
  *
  * the version number: 1.2.3 value is 10203
  */
-#define LIBXML_VERSION 21308
+#define LIBXML_VERSION 21404
 
 /**
  * LIBXML_VERSION_STRING:
  *
  * the version number string, 1.2.3 value is "10203"
  */
-#define LIBXML_VERSION_STRING "21308"
+#define LIBXML_VERSION_STRING "21404"
 
 /**
  * LIBXML_VERSION_EXTRA:
@@ -44,7 +44,7 @@
  * Macro to check that the libxml version in use is compatible with
  * the version the software has been compiled against
  */
-#define LIBXML_TEST_VERSION xmlCheckVersion(21308);
+#define LIBXML_TEST_VERSION xmlCheckVersion(21404);
 
 /**
  * LIBXML_THREAD_ENABLED:
@@ -67,11 +67,9 @@
 /**
  * LIBXML_TREE_ENABLED:
  *
- * Whether the DOM like tree manipulation API support is configured in
+ * Always enabled since 2.14.0
  */
-#if 1
 #define LIBXML_TREE_ENABLED
-#endif
 
 /**
  * LIBXML_OUTPUT_ENABLED:
@@ -127,21 +125,12 @@
 #define LIBXML_SAX1_ENABLED
 #endif
 
-/**
- * LIBXML_FTP_ENABLED:
- *
- * Whether the FTP support is configured in
- */
-#if 1
-#define LIBXML_FTP_ENABLED
-#endif
-
 /**
  * LIBXML_HTTP_ENABLED:
  *
  * Whether the HTTP support is configured in
  */
-#if 1
+#if 0
 #define LIBXML_HTTP_ENABLED
 #endif
 
@@ -166,11 +155,9 @@
 /**
  * LIBXML_LEGACY_ENABLED:
  *
- * Whether the deprecated APIs are compiled in for compatibility
+ * Removed in 2.14
  */
-#if 0
-#define LIBXML_LEGACY_ENABLED
-#endif
+#undef LIBXML_LEGACY_ENABLED
 
 /**
  * LIBXML_C14N_ENABLED:
@@ -208,15 +195,6 @@
 #define LIBXML_XPTR_ENABLED
 #endif
 
-/**
- * LIBXML_XPTR_LOCS_ENABLED:
- *
- * Whether support for XPointer locations is configured in
- */
-#if 0
-#define LIBXML_XPTR_LOCS_ENABLED
-#endif
-
 /**
  * LIBXML_XINCLUDE_ENABLED:
  *
@@ -265,11 +243,9 @@
 /**
  * LIBXML_UNICODE_ENABLED:
  *
- * Whether the Unicode related interfaces are compiled in
+ * Removed in 2.14
  */
-#if 1
-#define LIBXML_UNICODE_ENABLED
-#endif
+#undef LIBXML_UNICODE_ENABLED
 
 /**
  * LIBXML_REGEXP_ENABLED:
@@ -289,6 +265,15 @@
 #define LIBXML_AUTOMATA_ENABLED
 #endif
 
+/**
+ * LIBXML_RELAXNG_ENABLED:
+ *
+ * Whether the RelaxNG validation interfaces are compiled in
+ */
+#if 1
+#define LIBXML_RELAXNG_ENABLED
+#endif
+
 /**
  * LIBXML_SCHEMAS_ENABLED:
  *

lxml/includes/libxml/xpath.h

@@ -26,15 +26,10 @@
 #include <libxml/xmlerror.h>
 #include <libxml/tree.h>
 #include <libxml/hash.h>
-#endif /* LIBXML_XPATH_ENABLED */
 
-#if defined(LIBXML_XPATH_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
 #ifdef __cplusplus
 extern "C" {
 #endif
-#endif /* LIBXML_XPATH_ENABLED or LIBXML_SCHEMAS_ENABLED */
-
-#ifdef LIBXML_XPATH_ENABLED
 
 typedef struct _xmlXPathContext xmlXPathContext;
 typedef xmlXPathContext *xmlXPathContextPtr;
@@ -104,22 +99,15 @@ typedef enum {
     XPATH_BOOLEAN = 2,
     XPATH_NUMBER = 3,
     XPATH_STRING = 4,
-#ifdef LIBXML_XPTR_LOCS_ENABLED
-    XPATH_POINT = 5,
-    XPATH_RANGE = 6,
-    XPATH_LOCATIONSET = 7,
-#endif
     XPATH_USERS = 8,
     XPATH_XSLT_TREE = 9  /* An XSLT value tree, non modifiable */
 } xmlXPathObjectType;
 
-#ifndef LIBXML_XPTR_LOCS_ENABLED
 /** DOC_DISABLE */
 #define XPATH_POINT 5
 #define XPATH_RANGE 6
 #define XPATH_LOCATIONSET 7
 /** DOC_ENABLE */
-#endif
 
 typedef struct _xmlXPathObject xmlXPathObject;
 typedef xmlXPathObject *xmlXPathObjectPtr;
@@ -413,8 +401,11 @@ struct _xmlXPathParserContext {
  * Objects and Nodesets handling
  */
 
+XML_DEPRECATED
 XMLPUBVAR double xmlXPathNAN;
+XML_DEPRECATED
 XMLPUBVAR double xmlXPathPINF;
+XML_DEPRECATED
 XMLPUBVAR double xmlXPathNINF;
 
 /* These macros may later turn into functions */
@@ -561,8 +552,7 @@ XMLPUBFUN int
 						 xmlXPathContextPtr ctxt);
 XMLPUBFUN void
 		    xmlXPathFreeCompExpr	(xmlXPathCompExprPtr comp);
-#endif /* LIBXML_XPATH_ENABLED */
-#if defined(LIBXML_XPATH_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
+
 XML_DEPRECATED
 XMLPUBFUN void
 		    xmlXPathInit		(void);
@@ -575,5 +565,5 @@ XMLPUBFUN int
 }
 #endif
 
-#endif /* LIBXML_XPATH_ENABLED or LIBXML_SCHEMAS_ENABLED*/
+#endif /* LIBXML_XPATH_ENABLED */
 #endif /* ! __XML_XPATH_H__ */

lxml/includes/libxml/xpathInternals.h

@@ -22,6 +22,12 @@
 extern "C" {
 #endif
 
+/*
+ * Backward compatibility
+ */
+#define valuePush xmlXPathValuePush
+#define valuePop xmlXPathValuePop
+
 /************************************************************************
  *									*
  *			Helpers						*
@@ -478,11 +484,10 @@ XMLPUBFUN xmlXPathParserContextPtr
 XMLPUBFUN void
 		xmlXPathFreeParserContext	(xmlXPathParserContextPtr ctxt);
 
-/* TODO: remap to xmlXPathValuePop and Push. */
 XMLPUBFUN xmlXPathObjectPtr
-		valuePop			(xmlXPathParserContextPtr ctxt);
+		xmlXPathValuePop		(xmlXPathParserContextPtr ctxt);
 XMLPUBFUN int
-		valuePush			(xmlXPathParserContextPtr ctxt,
+		xmlXPathValuePush		(xmlXPathParserContextPtr ctxt,
 						 xmlXPathObjectPtr value);
 
 XMLPUBFUN xmlXPathObjectPtr
@@ -516,6 +521,7 @@ XMLPUBFUN void
 
 XMLPUBFUN void
 		xmlXPathRoot			(xmlXPathParserContextPtr ctxt);
+XML_DEPRECATED
 XMLPUBFUN void
 		xmlXPathEvalExpr		(xmlXPathParserContextPtr ctxt);
 XMLPUBFUN xmlChar *

lxml/includes/libxml/xpointer.h

@@ -28,88 +28,10 @@
 extern "C" {
 #endif
 
-#if defined(LIBXML_XPTR_LOCS_ENABLED)
-/*
- * A Location Set
- */
-typedef struct _xmlLocationSet xmlLocationSet;
-typedef xmlLocationSet *xmlLocationSetPtr;
-struct _xmlLocationSet {
-    int locNr;		      /* number of locations in the set */
-    int locMax;		      /* size of the array as allocated */
-    xmlXPathObjectPtr *locTab;/* array of locations */
-};
-
-/*
- * Handling of location sets.
- */
-
-XML_DEPRECATED
-XMLPUBFUN xmlLocationSetPtr
-		    xmlXPtrLocationSetCreate	(xmlXPathObjectPtr val);
-XML_DEPRECATED
-XMLPUBFUN void
-		    xmlXPtrFreeLocationSet	(xmlLocationSetPtr obj);
-XML_DEPRECATED
-XMLPUBFUN xmlLocationSetPtr
-		    xmlXPtrLocationSetMerge	(xmlLocationSetPtr val1,
-						 xmlLocationSetPtr val2);
-XML_DEPRECATED
-XMLPUBFUN xmlXPathObjectPtr
-		    xmlXPtrNewRange		(xmlNodePtr start,
-						 int startindex,
-						 xmlNodePtr end,
-						 int endindex);
-XML_DEPRECATED
-XMLPUBFUN xmlXPathObjectPtr
-		    xmlXPtrNewRangePoints	(xmlXPathObjectPtr start,
-						 xmlXPathObjectPtr end);
-XML_DEPRECATED
-XMLPUBFUN xmlXPathObjectPtr
-		    xmlXPtrNewRangeNodePoint	(xmlNodePtr start,
-						 xmlXPathObjectPtr end);
-XML_DEPRECATED
-XMLPUBFUN xmlXPathObjectPtr
-		    xmlXPtrNewRangePointNode	(xmlXPathObjectPtr start,
-						 xmlNodePtr end);
-XML_DEPRECATED
-XMLPUBFUN xmlXPathObjectPtr
-		    xmlXPtrNewRangeNodes	(xmlNodePtr start,
-						 xmlNodePtr end);
-XML_DEPRECATED
-XMLPUBFUN xmlXPathObjectPtr
-		    xmlXPtrNewLocationSetNodes	(xmlNodePtr start,
-						 xmlNodePtr end);
-XML_DEPRECATED
-XMLPUBFUN xmlXPathObjectPtr
-		    xmlXPtrNewLocationSetNodeSet(xmlNodeSetPtr set);
-XML_DEPRECATED
-XMLPUBFUN xmlXPathObjectPtr
-		    xmlXPtrNewRangeNodeObject	(xmlNodePtr start,
-						 xmlXPathObjectPtr end);
-XML_DEPRECATED
-XMLPUBFUN xmlXPathObjectPtr
-		    xmlXPtrNewCollapsedRange	(xmlNodePtr start);
-XML_DEPRECATED
-XMLPUBFUN void
-		    xmlXPtrLocationSetAdd	(xmlLocationSetPtr cur,
-						 xmlXPathObjectPtr val);
-XML_DEPRECATED
-XMLPUBFUN xmlXPathObjectPtr
-		    xmlXPtrWrapLocationSet	(xmlLocationSetPtr val);
-XML_DEPRECATED
-XMLPUBFUN void
-		    xmlXPtrLocationSetDel	(xmlLocationSetPtr cur,
-						 xmlXPathObjectPtr val);
-XML_DEPRECATED
-XMLPUBFUN void
-		    xmlXPtrLocationSetRemove	(xmlLocationSetPtr cur,
-						 int val);
-#endif /* defined(LIBXML_XPTR_LOCS_ENABLED) */
-
 /*
  * Functions.
  */
+XML_DEPRECATED
 XMLPUBFUN xmlXPathContextPtr
 		    xmlXPtrNewContext		(xmlDocPtr doc,
 						 xmlNodePtr here,
@@ -118,18 +40,6 @@ XMLPUBFUN xmlXPathObjectPtr
 		    xmlXPtrEval			(const xmlChar *str,
 						 xmlXPathContextPtr ctx);
 
-#if defined(LIBXML_XPTR_LOCS_ENABLED)
-XML_DEPRECATED
-XMLPUBFUN void
-		    xmlXPtrRangeToFunction	(xmlXPathParserContextPtr ctxt,
-						 int nargs);
-XML_DEPRECATED
-XMLPUBFUN xmlNodePtr
-		    xmlXPtrBuildNodeList	(xmlXPathObjectPtr obj);
-XML_DEPRECATED
-XMLPUBFUN void
-		    xmlXPtrEvalRangePredicate	(xmlXPathParserContextPtr ctxt);
-#endif /* defined(LIBXML_XPTR_LOCS_ENABLED) */
 #ifdef __cplusplus
 }
 #endif

lxml/includes/lxml-version.h

@@ -1,3 +1,3 @@
 #ifndef LXML_VERSION_STRING
-#define LXML_VERSION_STRING "5.4.0"
+#define LXML_VERSION_STRING "6.0.0"
 #endif

lxml/includes/tree.pxd

@@ -6,8 +6,9 @@ cdef extern from "lxml-version.h":
     cdef char* LXML_VERSION_STRING
 
 cdef extern from "libxml/xmlversion.h":
-    cdef const_char* xmlParserVersion
-    cdef int LIBXML_VERSION
+    const char* xmlParserVersion
+    int LIBXML_VERSION
+
 
 cdef extern from "libxml/xmlstring.h" nogil:
     ctypedef unsigned char xmlChar
@@ -141,7 +142,7 @@ cdef extern from "libxml/tree.h" nogil:
         XML_ATTRIBUTE_NMTOKENS=    8
         XML_ATTRIBUTE_ENUMERATION= 9
         XML_ATTRIBUTE_NOTATION=    10
-    
+
     ctypedef enum xmlAttributeDefault:
         XML_ATTRIBUTE_NONE=     1
         XML_ATTRIBUTE_REQUIRED= 2
@@ -288,7 +289,7 @@ cdef extern from "libxml/tree.h" nogil:
         xmlDtd* intSubset
         xmlDtd* extSubset
         int properties
-        
+
     ctypedef struct xmlAttr:
         void* _private
         xmlElementType type
@@ -307,7 +308,7 @@ cdef extern from "libxml/tree.h" nogil:
         const_xmlChar* name
         xmlAttr* attr
         xmlDoc* doc
-        
+
     ctypedef struct xmlBuffer
 
     ctypedef struct xmlBuf   # new in libxml2 2.9
@@ -318,14 +319,14 @@ cdef extern from "libxml/tree.h" nogil:
         int error
 
     const_xmlChar* XML_XML_NAMESPACE
-        
+
     cdef void xmlFreeDoc(xmlDoc* cur)
     cdef void xmlFreeDtd(xmlDtd* cur)
     cdef void xmlFreeNode(xmlNode* cur)
     cdef void xmlFreeNsList(xmlNs* ns)
     cdef void xmlFreeNs(xmlNs* ns)
     cdef void xmlFree(void* buf)
-    
+
     cdef xmlNode* xmlNewNode(xmlNs* ns, const_xmlChar* name)
     cdef xmlNode* xmlNewDocText(xmlDoc* doc, const_xmlChar* content)
     cdef xmlNode* xmlNewDocComment(xmlDoc* doc, const_xmlChar* content)
@@ -437,7 +438,7 @@ cdef extern from "libxml/xmlIO.h":
     cdef xmlOutputBuffer* xmlOutputBufferCreateIO(
         xmlOutputWriteCallback iowrite,
         xmlOutputCloseCallback ioclose,
-        void * ioctx, 
+        void * ioctx,
         xmlCharEncodingHandler* encoder) nogil
     cdef xmlOutputBuffer* xmlOutputBufferCreateFile(
         stdio.FILE* file, xmlCharEncodingHandler* encoder) nogil
@@ -471,14 +472,11 @@ cdef extern from "libxml/globals.h" nogil:
     cdef int xmlThrDefKeepBlanksDefaultValue(int onoff)
     cdef int xmlThrDefLineNumbersDefaultValue(int onoff)
     cdef int xmlThrDefIndentTreeOutput(int onoff)
-    
+
 cdef extern from "libxml/xmlmemory.h" nogil:
     cdef void* xmlMalloc(size_t size)
     cdef int xmlMemBlocks()
     cdef int xmlMemUsed()
-    cdef void xmlMemDisplay(stdio.FILE* file)
-    cdef void xmlMemDisplayLast(stdio.FILE* file, long num_bytes)
-    cdef void xmlMemShow(stdio.FILE* file, int count)
 
 cdef extern from "etree_defs.h" nogil:
     cdef bint _isElement(xmlNode* node)

lxml/includes/xmlparser.pxd

@@ -32,11 +32,11 @@ cdef extern from "libxml/parser.h" nogil:
 
     ctypedef void (*commentSAXFunc)(void* ctx, const_xmlChar* value) noexcept
 
-    ctypedef void (*processingInstructionSAXFunc)(void* ctx, 
+    ctypedef void (*processingInstructionSAXFunc)(void* ctx,
                                                   const_xmlChar* target,
                                                   const_xmlChar* data) noexcept
 
-    ctypedef void (*internalSubsetSAXFunc)(void* ctx, 
+    ctypedef void (*internalSubsetSAXFunc)(void* ctx,
                                             const_xmlChar* name,
                                             const_xmlChar* externalID,
                                             const_xmlChar* systemID) noexcept
@@ -99,11 +99,48 @@ cdef extern from "libxml/xmlIO.h" nogil:
 
 cdef extern from "libxml/parser.h" nogil:
 
+    ctypedef enum xmlFeature:
+        XML_WITH_THREAD = 1
+        XML_WITH_TREE = 2
+        XML_WITH_OUTPUT = 3
+        XML_WITH_PUSH = 4
+        XML_WITH_READER = 5
+        XML_WITH_PATTERN = 6
+        XML_WITH_WRITER = 7
+        XML_WITH_SAX1 = 8
+        XML_WITH_FTP = 9
+        XML_WITH_HTTP = 10
+        XML_WITH_VALID = 11
+        XML_WITH_HTML = 12
+        XML_WITH_LEGACY = 13
+        XML_WITH_C14N = 14
+        XML_WITH_CATALOG = 15
+        XML_WITH_XPATH = 16
+        XML_WITH_XPTR = 17
+        XML_WITH_XINCLUDE = 18
+        XML_WITH_ICONV = 19
+        XML_WITH_ISO8859X = 20
+        XML_WITH_UNICODE = 21
+        XML_WITH_REGEXP = 22
+        XML_WITH_AUTOMATA = 23
+        XML_WITH_EXPR = 24
+        XML_WITH_SCHEMAS = 25
+        XML_WITH_SCHEMATRON = 26
+        XML_WITH_MODULES = 27
+        XML_WITH_DEBUG = 28
+        XML_WITH_DEBUG_MEM = 29
+        XML_WITH_DEBUG_RUN = 30
+        XML_WITH_ZLIB = 31
+        XML_WITH_ICU = 32
+        XML_WITH_LZMA = 33
+
+    cdef bint xmlHasFeature(xmlFeature feature)
+
     cdef xmlDict* xmlDictCreate()
     cdef xmlDict* xmlDictCreateSub(xmlDict* subdict)
     cdef void xmlDictFree(xmlDict* sub)
     cdef int xmlDictReference(xmlDict* dict)
-    
+
     cdef int XML_COMPLETE_ATTRS  # SAX option for adding DTD default attributes
     cdef int XML_SKIP_IDS        # SAX option for not building an XML ID dict
 
@@ -207,9 +244,9 @@ cdef extern from "libxml/parser.h" nogil:
     cdef xmlDoc* xmlCtxtReadFile(xmlParserCtxt* ctxt,
                                  char* filename, char* encoding,
                                  int options)
-    cdef xmlDoc* xmlCtxtReadIO(xmlParserCtxt* ctxt, 
-                               xmlInputReadCallback ioread, 
-                               xmlInputCloseCallback ioclose, 
+    cdef xmlDoc* xmlCtxtReadIO(xmlParserCtxt* ctxt,
+                               xmlInputReadCallback ioread,
+                               xmlInputCloseCallback ioclose,
                                void* ioctx,
                                char* URL, char* encoding,
                                int options)
@@ -257,9 +294,10 @@ cdef extern from "libxml/parser.h" nogil:
 
 cdef extern from "libxml/parserInternals.h" nogil:
     cdef xmlParserInput* xmlNewInputStream(xmlParserCtxt* ctxt)
-    cdef xmlParserInput* xmlNewStringInputStream(xmlParserCtxt* ctxt, 
+    cdef xmlParserInput* xmlNewStringInputStream(xmlParserCtxt* ctxt,
                                                  char* buffer)
-    cdef xmlParserInput* xmlNewInputFromFile(xmlParserCtxt* ctxt, 
+    cdef xmlParserInput* xmlNewInputFromFile(xmlParserCtxt* ctxt,
                                              char* filename)
     cdef void xmlFreeInputStream(xmlParserInput* input)
     cdef int xmlSwitchEncoding(xmlParserCtxt* ctxt, int enc)
+    cdef bint xmlCtxtIsStopped(xmlParserCtxt* ctxt)

lxml/lxml.etree.h

@@ -1,4 +1,4 @@
-/* Generated by Cython 3.0.12 */
+/* Generated by Cython 3.1.2 */
 
 #ifndef __PYX_HAVE__lxml__etree
 #define __PYX_HAVE__lxml__etree
@@ -13,22 +13,22 @@ struct LxmlElementBase;
 struct LxmlElementClassLookup;
 struct LxmlFallbackElementClassLookup;
 
-/* "lxml/etree.pyx":355
+/* "lxml/etree.pyx":451
  * 
  * # type of a function that steps from node to node
  * ctypedef public xmlNode* (*_node_to_node_function)(xmlNode*)             # <<<<<<<<<<<<<<
  * 
  * 
- */
+*/
 typedef xmlNode *(*_node_to_node_function)(xmlNode *);
 
-/* "lxml/etree.pyx":371
- * @cython.final
- * @cython.freelist(8)
- * cdef public class _Document [ type LxmlDocumentType, object LxmlDocument ]:             # <<<<<<<<<<<<<<
- *     """Internal base class to reference a libxml document.
+/* "lxml/etree.pyx":465
+ * # Public Python API
  * 
- */
+ * @cython.final             # <<<<<<<<<<<<<<
+ * @cython.freelist(8)
+ * cdef public class _Document [ type LxmlDocumentType, object LxmlDocument ]:
+*/
 struct LxmlDocument {
   PyObject_HEAD
   struct __pyx_vtabstruct_4lxml_5etree__Document *__pyx_vtab;
@@ -38,13 +38,13 @@ struct LxmlDocument {
   struct __pyx_obj_4lxml_5etree__BaseParser *_parser;
 };
 
-/* "lxml/etree.pyx":720
+/* "lxml/etree.pyx":817
  * 
- * @cython.no_gc_clear
- * cdef public class _Element [ type LxmlElementType, object LxmlElement ]:             # <<<<<<<<<<<<<<
- *     """Element class.
  * 
- */
+ * @cython.no_gc_clear             # <<<<<<<<<<<<<<
+ * cdef public class _Element [ type LxmlElementType, object LxmlElement ]:
+ *     """Element class.
+*/
 struct LxmlElement {
   PyObject_HEAD
   struct LxmlDocument *_doc;
@@ -52,13 +52,13 @@ struct LxmlElement {
   PyObject *_tag;
 };
 
-/* "lxml/etree.pyx":1895
+/* "lxml/etree.pyx":1991
  * 
  * 
  * cdef public class _ElementTree [ type LxmlElementTreeType,             # <<<<<<<<<<<<<<
  *                                  object LxmlElementTree ]:
  *     cdef _Document _doc
- */
+*/
 struct LxmlElementTree {
   PyObject_HEAD
   struct __pyx_vtabstruct_4lxml_5etree__ElementTree *__pyx_vtab;
@@ -66,13 +66,13 @@ struct LxmlElementTree {
   struct LxmlElement *_context_node;
 };
 
-/* "lxml/etree.pyx":2669
+/* "lxml/etree.pyx":2765
  * 
  * 
  * cdef public class _ElementTagMatcher [ object LxmlElementTagMatcher,             # <<<<<<<<<<<<<<
  *                                        type LxmlElementTagMatcherType ]:
  *     """
- */
+*/
 struct LxmlElementTagMatcher {
   PyObject_HEAD
   struct __pyx_vtabstruct_4lxml_5etree__ElementTagMatcher *__pyx_vtab;
@@ -82,13 +82,13 @@ struct LxmlElementTagMatcher {
   char *_name;
 };
 
-/* "lxml/etree.pyx":2700
+/* "lxml/etree.pyx":2796
  *                 self._name = NULL
  * 
  * cdef public class _ElementIterator(_ElementTagMatcher) [             # <<<<<<<<<<<<<<
  *     object LxmlElementIterator, type LxmlElementIteratorType ]:
  *     """
- */
+*/
 struct LxmlElementIterator {
   struct LxmlElementTagMatcher __pyx_base;
   struct LxmlElement *_node;
@@ -101,7 +101,7 @@ struct LxmlElementIterator {
  * cdef public class ElementBase(_Element) [ type LxmlElementBaseType,             # <<<<<<<<<<<<<<
  *                                           object LxmlElementBase ]:
  *     """ElementBase(*children, attrib=None, nsmap=None, **_extra)
- */
+*/
 struct LxmlElementBase {
   struct LxmlElement __pyx_base;
 };
@@ -112,7 +112,7 @@ struct LxmlElementBase {
  * ctypedef public object (*_element_class_lookup_function)(object, _Document, xmlNode*)             # <<<<<<<<<<<<<<
  * 
  * # class to store element class lookup functions
- */
+*/
 typedef PyObject *(*_element_class_lookup_function)(PyObject *, struct LxmlDocument *, xmlNode *);
 
 /* "src/lxml/classlookup.pxi":213
@@ -121,7 +121,7 @@ typedef PyObject *(*_element_class_lookup_function)(PyObject *, struct LxmlDocum
  * cdef public class ElementClassLookup [ type LxmlElementClassLookupType,             # <<<<<<<<<<<<<<
  *                                        object LxmlElementClassLookup ]:
  *     """ElementClassLookup(self)
- */
+*/
 struct LxmlElementClassLookup {
   PyObject_HEAD
   _element_class_lookup_function _lookup_function;
@@ -133,7 +133,7 @@ struct LxmlElementClassLookup {
  * cdef public class FallbackElementClassLookup(ElementClassLookup) \             # <<<<<<<<<<<<<<
  *          [ type LxmlFallbackElementClassLookupType,
  *            object LxmlFallbackElementClassLookup ]:
- */
+*/
 struct LxmlFallbackElementClassLookup {
   struct LxmlElementClassLookup __pyx_base;
   struct __pyx_vtabstruct_4lxml_5etree_FallbackElementClassLookup *__pyx_vtab;
@@ -224,9 +224,6 @@ __PYX_EXTERN_C xmlNs *findOrBuildNodeNsPrefix(struct LxmlDocument *, xmlNode *,
 /* WARNING: the interface of the module init function changed in CPython 3.5. */
 /* It now returns a PyModuleDef instance instead of a PyModule instance. */
 
-#if PY_MAJOR_VERSION < 3
-PyMODINIT_FUNC initetree(void);
-#else
 /* WARNING: Use PyImport_AppendInittab("etree", PyInit_etree) instead of calling PyInit_etree directly from Python 3.5 */
 PyMODINIT_FUNC PyInit_etree(void);
 
@@ -243,6 +240,5 @@ static PyObject* __PYX_WARN_IF_PyInit_etree_INIT_CALLED(PyObject* res) {
 }
 #define PyInit_etree() __PYX_WARN_IF_PyInit_etree_INIT_CALLED(PyInit_etree())
 #endif
-#endif
 
 #endif /* !__PYX_HAVE__lxml__etree */