lxml 5.4.0__cp38-cp38-win32.whl → 6.0.0__cp38-cp38-win32.whl

lxml/__init__.py

@@ -1,6 +1,6 @@
 # this is a package
 
-__version__ = "5.4.0"
+__version__ = "6.0.0"
 
 
 def get_include():

lxml/_elementpath.py

@@ -1,4 +1,4 @@
-# cython: language_level=2
+# cython: language_level=3
 
 #
 # ElementTree
@@ -85,6 +85,8 @@ def xpath_tokenizer(pattern, namespaces=None, with_prefixes=True):
                     yield ttype, "{%s}%s" % (namespaces[prefix], uri)
                 except KeyError:
                     raise SyntaxError("prefix %r not found in prefix map" % prefix)
+            elif tag.isdecimal():
+                yield token  # index
             elif default_namespace and not parsing_attribute:
                 yield ttype, "{%s}%s" % (default_namespace, tag)
             else:

lxml/apihelpers.pxi

@@ -439,7 +439,7 @@ cdef int _removeUnusedNamespaceDeclarations(xmlNode* c_element, set prefixes_to_
                 c_nsdef = c_nsdef.next
             c_nsdef.next = c_nsdef.next.next
         tree.xmlFreeNs(c_ns_list[i].ns)
-    
+
     if c_ns_list is not NULL:
         python.lxml_free(c_ns_list)
     return 0
@@ -685,7 +685,7 @@ cdef unicode _collectText(xmlNode* c_node):
     """Collect all text nodes and return them as a unicode string.
 
     Start collecting at c_node.
-    
+
     If there was no text to collect, return None
     """
     cdef Py_ssize_t scount
@@ -845,7 +845,7 @@ cdef inline xmlNode* _findChild(xmlNode* c_node, Py_ssize_t index) noexcept:
         return _findChildBackwards(c_node, -index - 1)
     else:
         return _findChildForwards(c_node, index)
-    
+
 cdef inline xmlNode* _findChildForwards(xmlNode* c_node, Py_ssize_t index) noexcept:
     """Return child element of c_node with index, or return NULL if not found.
     """
@@ -876,7 +876,7 @@ cdef inline xmlNode* _findChildBackwards(xmlNode* c_node, Py_ssize_t index) noex
             c += 1
         c_child = c_child.prev
     return NULL
-    
+
 cdef inline xmlNode* _textNodeOrSkip(xmlNode* c_node) noexcept nogil:
     """Return the node if it's a text node.  Skip over ignorable nodes in a
     series of text nodes.  Return NULL if a non-ignorable node is found.
@@ -1031,23 +1031,31 @@ cdef Py_ssize_t _mapTagsToQnameMatchArray(xmlDoc* c_doc, list ns_tags,
     Note that each qname struct in the array owns its href byte string object
     if it is not NULL.
     """
-    cdef Py_ssize_t count = 0, i
+    cdef Py_ssize_t count = 0, i, c_tag_len
     cdef bytes ns, tag
+    cdef const_xmlChar* c_tag
+
     for ns, tag in ns_tags:
         if tag is None:
-            c_tag = <const_xmlChar*>NULL
-        elif force_into_dict:
-            c_tag = tree.xmlDictLookup(c_doc.dict, _xcstr(tag), len(tag))
-            if c_tag is NULL:
-                # clean up before raising the error
-                for i in xrange(count):
-                    cpython.ref.Py_XDECREF(c_ns_tags[i].href)
-                raise MemoryError()
+            c_tag = <const_xmlChar*> NULL
         else:
-            c_tag = tree.xmlDictExists(c_doc.dict, _xcstr(tag), len(tag))
-            if c_tag is NULL:
-                # not in the dict => not in the document
+            c_tag_len = len(tag)
+            if c_tag_len > limits.INT_MAX:
+                # too long, not in the dict => not in the document
                 continue
+            elif force_into_dict:
+                c_tag = tree.xmlDictLookup(c_doc.dict, _xcstr(tag), <int> c_tag_len)
+                if c_tag is NULL:
+                    # clean up before raising the error
+                    for i in xrange(count):
+                        cpython.ref.Py_XDECREF(c_ns_tags[i].href)
+                    raise MemoryError()
+            else:
+                c_tag = tree.xmlDictExists(c_doc.dict, _xcstr(tag), <int> c_tag_len)
+                if c_tag is NULL:
+                    # not in the dict => not in the document
+                    continue
+
         c_ns_tags[count].c_name = c_tag
         if ns is None:
             c_ns_tags[count].href = NULL
@@ -1095,7 +1103,7 @@ cdef int _removeSiblings(xmlNode* c_element, tree.xmlElementType node_type, bint
 
 cdef void _moveTail(xmlNode* c_tail, xmlNode* c_target) noexcept:
     cdef xmlNode* c_next
-    # tail support: look for any text nodes trailing this node and 
+    # tail support: look for any text nodes trailing this node and
     # move them too
     c_tail = _textNodeOrSkip(c_tail)
     while c_tail is not NULL:

lxml/builder.py

@@ -45,6 +45,13 @@ _QName = ET.QName
 
 from functools import partial
 
+try:
+    from types import GenericAlias as _GenericAlias
+except ImportError:
+    # Python 3.8 - we only need this as return value from "__class_getitem__"
+    def _GenericAlias(cls, item):
+        return f"{cls.__name__}[{item.__name__}]"
+
 try:
     basestring
 except NameError:
@@ -227,6 +234,10 @@ class ElementMaker:
     def __getattr__(self, tag):
         return partial(self, tag)
 
+    # Allow subscripting ElementMaker in type annotions (PEP 560)
+    def __class_getitem__(cls, item):
+        return _GenericAlias(cls, item)
+
 
 # create factory object
 E = ElementMaker()

lxml/debug.pxi

@@ -32,59 +32,5 @@ cdef class _MemDebug:
             raise MemoryError()
         return tree.xmlDictSize(c_dict)
 
-    def dump(self, output_file=None, byte_count=None):
-        """dump(self, output_file=None, byte_count=None)
-
-        Dumps the current memory blocks allocated by libxml2 to a file.
-
-        The optional parameter 'output_file' specifies the file path.  It defaults
-        to the file ".memorylist" in the current directory.
-
-        The optional parameter 'byte_count' limits the number of bytes in the dump.
-        Note that this parameter is ignored when lxml is compiled against a libxml2
-        version before 2.7.0.
-        """
-        cdef Py_ssize_t c_count
-        if output_file is None:
-            output_file = b'.memorylist'
-        elif isinstance(output_file, unicode):
-            output_file.encode(sys.getfilesystemencoding())
-
-        f = stdio.fopen(output_file, "w")
-        if f is NULL:
-            raise IOError(f"Failed to create file {output_file.decode(sys.getfilesystemencoding())}")
-        try:
-            if byte_count is None:
-                tree.xmlMemDisplay(f)
-            else:
-                c_count = byte_count
-                tree.xmlMemDisplayLast(f, c_count)
-        finally:
-            stdio.fclose(f)
-
-    def show(self, output_file=None, block_count=None):
-        """show(self, output_file=None, block_count=None)
-
-        Dumps the current memory blocks allocated by libxml2 to a file.
-        The output file format is suitable for line diffing.
-
-        The optional parameter 'output_file' specifies the file path.  It defaults
-        to the file ".memorydump" in the current directory.
-
-        The optional parameter 'block_count' limits the number of blocks
-        in the dump.
-        """
-        if output_file is None:
-            output_file = b'.memorydump'
-        elif isinstance(output_file, unicode):
-            output_file.encode(sys.getfilesystemencoding())
-
-        f = stdio.fopen(output_file, "w")
-        if f is NULL:
-            raise IOError(f"Failed to create file {output_file.decode(sys.getfilesystemencoding())}")
-        try:
-            tree.xmlMemShow(f, block_count if block_count is not None else tree.xmlMemBlocks())
-        finally:
-            stdio.fclose(f)
 
 memory_debugger = _MemDebug()