elementpath 5.0.4__tar.gz → 5.1.1__tar.gz

{elementpath-5.0.4 → elementpath-5.1.1}/CHANGELOG.rst

@@ -2,6 +2,18 @@
 CHANGELOG
 *********
 
+`v5.1.1`_ (2026-01-20)
+======================
+* Fix external function registrations (issue #099)
+* Add ExternalFunction and SchemaConstructor token classes
+
+`v5.1.0`_ (2025-12-28)
+======================
+* Drop Python 3.9 compatibility and add Pyton 3.15 support
+* Improve XPath sequence internal processing with a list derived type `xlist'
+* Extensions and fixes for XSD datatypes
+* Add `XSequence` datatype for external representation of XPath sequences
+
 `v5.0.4`_ (2025-08-16)
 ======================
 * Fix default/fixed values processing of schema annotated XML data (issue #94)
@@ -523,3 +535,5 @@ CHANGELOG
 .. _v5.0.2: https://github.com/sissaschool/elementpath/compare/v5.0.1...v5.0.2
 .. _v5.0.3: https://github.com/sissaschool/elementpath/compare/v5.0.2...v5.0.3
 .. _v5.0.4: https://github.com/sissaschool/elementpath/compare/v5.0.3...v5.0.4
+.. _v5.1.0: https://github.com/sissaschool/elementpath/compare/v5.0.4...v5.1.0
+.. _v5.1.1: https://github.com/sissaschool/elementpath/compare/v5.1.0...v5.1.1

{elementpath-5.0.4 → elementpath-5.1.1}/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c), 2018-2021, SISSA (Scuola Internazionale Superiore di Studi Avanzati)
+Copyright (c), 2018-2026, SISSA (Scuola Internazionale Superiore di Studi Avanzati)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

{elementpath-5.0.4/elementpath.egg-info → elementpath-5.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: elementpath
-Version: 5.0.4
+Version: 5.1.1
 Summary: XPath 1.0/2.0/3.0/3.1 parsers and selectors for ElementTree and lxml
 Author-email: Davide Brunato <brunato@sissa.it>
 License-Expression: MIT
@@ -13,17 +13,17 @@ Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Text Processing :: Markup :: XML
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 Provides-Extra: dev
@@ -31,11 +31,11 @@ Requires-Dist: coverage; extra == "dev"
 Requires-Dist: flake8; extra == "dev"
 Requires-Dist: lxml; extra == "dev"
 Requires-Dist: lxml-stubs; extra == "dev"
-Requires-Dist: memray; extra == "dev"
+Requires-Dist: memray; platform_python_implementation != "PyPy" and extra == "dev"
 Requires-Dist: mypy; extra == "dev"
 Requires-Dist: psutil; extra == "dev"
 Requires-Dist: sphinx; extra == "dev"
-Requires-Dist: tox; extra == "dev"
+Requires-Dist: tox>=4.0; extra == "dev"
 Requires-Dist: xmlschema>=4.0.1; extra == "dev"
 Provides-Extra: docs
 Requires-Dist: sphinx; extra == "docs"
@@ -55,8 +55,6 @@ elementpath
 .. image:: https://img.shields.io/badge/License-MIT-blue.svg
    :alt: MIT License
    :target: https://lbesson.mit-license.org/
-.. image:: https://img.shields.io/pypi/dm/elementpath.svg
-   :target: https://pypi.python.org/pypi/elementpath/
 
 .. elementpath-introduction
 
@@ -72,7 +70,7 @@ has it's own implementation of XPath 1.0.
 Installation and usage
 ======================
 
-You can install the package with *pip* in a Python 3.9+ environment::
+You can install the package with *pip* in a Python 3.10+ environment::
 
     pip install elementpath
 

{elementpath-5.0.4 → elementpath-5.1.1}/README.rst

@@ -11,8 +11,6 @@ elementpath
 .. image:: https://img.shields.io/badge/License-MIT-blue.svg
    :alt: MIT License
    :target: https://lbesson.mit-license.org/
-.. image:: https://img.shields.io/pypi/dm/elementpath.svg
-   :target: https://pypi.python.org/pypi/elementpath/
 
 .. elementpath-introduction
 
@@ -28,7 +26,7 @@ has it's own implementation of XPath 1.0.
 Installation and usage
 ======================
 
-You can install the package with *pip* in a Python 3.9+ environment::
+You can install the package with *pip* in a Python 3.10+ environment::
 
     pip install elementpath
 

{elementpath-5.0.4 → elementpath-5.1.1}/doc/advanced.rst

@@ -80,6 +80,10 @@ represented by *XPathContext* objects.
     >>> token.evaluate(context)
     [EtreeElementNode(elem=<Element 'child' at ...)]
 
+.. note::
+    Since release v4.2.0 the *root* is optional. If the argument *root* is absent
+    the argument *item* is mandatory and the dynamic context remain without a root.
+
 In this case an error is raised if you don't provide a context:
 
 .. doctest::
@@ -97,10 +101,15 @@ Expressions that not depend on XML data can be evaluated also without a context:
     >>> token.evaluate()
     'foo bar'
 
+.. note::
+    Since release v4.2.0 the *root* is optional. If the argument *root* is absent
+    the argument *item* is mandatory and the dynamic context remain without a root.
+
 For more details on parsing and evaluation of XPath expressions see the
 `XPath processing model <https://www.w3.org/TR/xpath-3/#id-processing-model>`_.
 
 
+
 Node trees
 ==========
 
@@ -201,6 +210,20 @@ to restrict the scope to a subtree.
 
 The context *item* can be set with an XPath node, an atomic value or an XPath function.
 
+.. note::
+    With XPath 4.0 the context *item* will be generalized as a context *value*, that
+    can be set with a sequence of items. On this way the
+
+The data returned by dynamic evaluation can be a atomic value, a node or a function.
+Also sequence of items can be returned. Until now these sequences were represented
+using lists, but soon with XPath 4.0 an XPath sequence will be applicable also to
+single results as *context value*, so for internal processing and by low-le
+Soon, with
+
+
+    Since release v4.2.0 the *root* is optional. If the argument *root* is absent
+    the argument *item* is mandatory and the dynamic context remain without a root.
+
 .. note::
     Since release v4.2.0 the *root* is optional. If the argument *root* is absent
     the argument *item* is mandatory and the dynamic context remain without a root.

{elementpath-5.0.4 → elementpath-5.1.1}/doc/conf.py

@@ -25,13 +25,13 @@ sys.path.insert(0, os.path.abspath('..'))
 # -- Project information -----------------------------------------------------
 
 project = 'elementpath'
-copyright = '2018-2025, SISSA (International School for Advanced Studies)'
+copyright = '2018-2026, SISSA (International School for Advanced Studies)'
 author = 'Davide Brunato'
 
 # The short X.Y version
-version = '5.0'
+version = '5.1'
 # The full version, including alpha/beta/rc tags
-release = '5.0.4'
+release = '5.1.1'
 
 # -- General configuration ---------------------------------------------------
 

{elementpath-5.0.4 → elementpath-5.1.1}/doc/xpath_api.rst

@@ -171,3 +171,104 @@ There are also other exceptions, multiple derived from the base exception
 .. autoexception:: elementpath.ElementPathTypeError
 .. autoexception:: elementpath.ElementPathValueError
 .. autoexception:: elementpath.ElementPathZeroDivisionError
+
+
+XPath datatypes
+===============
+
+XPath datatypes include XSD datatypes and other datatype specific for XPath, like untyped atomic
+type and sequences.
+
+XSD special types
+-----------------
+.. autoclass:: elementpath.datatypes.AnyType
+.. autoclass:: elementpath.datatypes.AnySimpleType
+.. autoclass:: elementpath.datatypes.AnyAtomicType
+
+Proxy classes for primitive datatypes
+-------------------------------------
+.. automodule:: elementpath.datatypes.proxies
+.. autoclass:: elementpath.datatypes.StringProxy
+.. autoclass:: elementpath.datatypes.BooleanProxy
+.. autoclass:: elementpath.datatypes.DecimalProxy
+.. autoclass:: elementpath.datatypes.DoubleProxy
+
+XPath specific types
+--------------------
+.. autoclass:: elementpath.datatypes.UntypedAtomic
+.. autoclass:: elementpath.sequences.XSequence
+.. autoclass:: elementpath.datatypes.ErrorProxy
+
+Numeric types
+-------------
+.. autoclass:: elementpath.datatypes.Float
+.. autoclass:: elementpath.datatypes.Integer
+.. autoclass:: elementpath.datatypes.NonPositiveInteger
+.. autoclass:: elementpath.datatypes.NegativeInteger
+.. autoclass:: elementpath.datatypes.Long
+.. autoclass:: elementpath.datatypes.Int
+.. autoclass:: elementpath.datatypes.Short
+.. autoclass:: elementpath.datatypes.Byte
+.. autoclass:: elementpath.datatypes.NonNegativeInteger
+.. autoclass:: elementpath.datatypes.PositiveInteger
+.. autoclass:: elementpath.datatypes.UnsignedLong
+.. autoclass:: elementpath.datatypes.UnsignedInt
+.. autoclass:: elementpath.datatypes.UnsignedShort
+.. autoclass:: elementpath.datatypes.UnsignedByte
+
+String based types
+------------------
+.. autoclass:: elementpath.datatypes.NormalizedString
+.. autoclass:: elementpath.datatypes.XsdToken
+.. autoclass:: elementpath.datatypes.Language
+.. autoclass:: elementpath.datatypes.Name
+.. autoclass:: elementpath.datatypes.NCName
+.. autoclass:: elementpath.datatypes.Id
+.. autoclass:: elementpath.datatypes.Idref
+.. autoclass:: elementpath.datatypes.Entity
+.. autoclass:: elementpath.datatypes.NMToken
+
+List types
+----------
+.. autoclass:: elementpath.datatypes.NMTokens
+.. autoclass:: elementpath.datatypes.Idrefs
+.. autoclass:: elementpath.datatypes.Entities
+
+QName types
+-----------
+.. autoclass:: elementpath.datatypes.QName
+.. autoclass:: elementpath.datatypes.Notation
+
+Binary types
+------------
+.. autoclass:: elementpath.datatypes.Base64Binary
+.. autoclass:: elementpath.datatypes.HexBinary
+
+URI types
+---------
+.. autoclass:: elementpath.datatypes.AnyURI
+
+Date and time types
+-------------------
+.. autoclass:: elementpath.datatypes.DateTime
+.. autoclass:: elementpath.datatypes.DateTime10
+.. autoclass:: elementpath.datatypes.DateTimeStamp
+.. autoclass:: elementpath.datatypes.Date
+.. autoclass:: elementpath.datatypes.Date10
+.. autoclass:: elementpath.datatypes.GregorianDay
+.. autoclass:: elementpath.datatypes.GregorianMonth
+.. autoclass:: elementpath.datatypes.GregorianMonthDay
+.. autoclass:: elementpath.datatypes.GregorianYear
+.. autoclass:: elementpath.datatypes.GregorianYear10
+.. autoclass:: elementpath.datatypes.GregorianYearMonth
+.. autoclass:: elementpath.datatypes.GregorianYearMonth10
+.. autoclass:: elementpath.datatypes.Time
+.. autoclass:: elementpath.datatypes.Timezone
+
+Duration types
+--------------
+
+.. autoclass:: elementpath.datatypes.Duration
+.. autoclass:: elementpath.datatypes.YearMonthDuration
+.. autoclass:: elementpath.datatypes.DayTimeDuration
+

{elementpath-5.0.4 → elementpath-5.1.1}/elementpath/__init__.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c), 2018-2022, SISSA (International School for Advanced Studies).
+# Copyright (c), 2018-2026, SISSA (International School for Advanced Studies).
 # All rights reserved.
 # This file is distributed under the terms of the MIT License.
 # See the file 'LICENSE' in the root directory of the present
@@ -7,10 +7,10 @@
 #
 # @author Davide Brunato <brunato@sissa.it>
 #
-__version__ = '5.0.4'
+__version__ = '5.1.1'
 __author__ = "Davide Brunato"
 __contact__ = "brunato@sissa.it"
-__copyright__ = "Copyright 2018-2025, SISSA"
+__copyright__ = "Copyright 2018-2026, SISSA"
 __license__ = "MIT"
 __status__ = "Production/Stable"
 
@@ -41,12 +41,13 @@ from .regex import RegexError, translate_pattern, install_unicode_data, unicode_
 __all__ = ['datatypes', 'protocols', 'etree', 'ElementPathError', 'MissingContextError',
            'UnsupportedFeatureError', 'ElementPathKeyError',  'ElementPathLocaleError',
            'ElementPathZeroDivisionError', 'ElementPathNameError',
-           'ElementPathOverflowError', 'ElementPathRuntimeError', 'ElementPathSyntaxError',
-           'ElementPathTypeError', 'ElementPathValueError', 'XPathContext',
-           'XPathSchemaContext', 'XPathNode', 'AttributeNode', 'NamespaceNode',
-           'CommentNode', 'ProcessingInstructionNode', 'TextNode', 'ElementNode',
+           'ElementPathOverflowError', 'ElementPathRuntimeError',
+           'ElementPathSyntaxError', 'ElementPathTypeError', 'ElementPathValueError',
+           'XPathNode', 'AttributeNode', 'NamespaceNode', 'CommentNode',
+           'ProcessingInstructionNode', 'TextNode', 'ElementNode',
            'LazyElementNode', 'SchemaElementNode', 'DocumentNode', 'get_node_tree',
-           'build_node_tree', 'build_lxml_node_tree', 'build_schema_node_tree', 'XPathToken',
+           'build_node_tree', 'build_lxml_node_tree', 'build_schema_node_tree',
+           'XPathContext', 'XPathSchemaContext', 'XPathToken',
            'XPathFunction', 'XPath1Parser', 'XPath2Parser', 'select', 'iter_select',
            'Selector', 'AbstractSchemaProxy', 'RegexError', 'translate_pattern',
            'install_unicode_data', 'unicode_version']

elementpath-5.1.1/elementpath/aliases.py

@@ -0,0 +1,130 @@
+#
+# Copyright (c), 2025-2026, SISSA (International School for Advanced Studies).
+# All rights reserved.
+# This file is distributed under the terms of the MIT License.
+# See the file 'LICENSE' in the root directory of the present
+# distribution, or http://opensource.org/licenses/MIT.
+#
+# @author Davide Brunato <brunato@sissa.it>
+#
+"""Type annotation aliases for elementpath."""
+from collections.abc import MutableMapping, Iterator
+from decimal import Decimal
+from typing import Any, Optional, NoReturn, TYPE_CHECKING, TypeVar, Union
+
+if TYPE_CHECKING:
+    from .protocols import ElementProtocol, DocumentProtocol  # noqa: F401
+    from .protocols import XsdElementProtocol, XsdAttributeProtocol  # noqa: F401
+    from .protocols import DocumentType, ElementType, SchemaElemType  # noqa: F401
+    from .datatypes import AnyAtomicType, AbstractDateTime, QName, AnyURI  # noqa: F401
+    from .datatypes import Date, DateTime, Time, GregorianYear, GregorianMonth  # noqa: F401
+    from .datatypes import GregorianDay, GregorianYearMonth, GregorianMonthDay  # noqa: F401
+    from .datatypes import DateTimeStamp, Duration, UntypedAtomic  # noqa: F401
+    from .datatypes import DayTimeDuration, YearMonthDuration  # noqa: F401
+    from .schema_proxy import AbstractSchemaProxy  # noqa: F401
+    from .xpath_nodes import XPathNode, ElementNode, AttributeNode  # noqa: F401
+    from .xpath_nodes import TextNode, DocumentNode, NamespaceNode  # noqa: F401
+    from .xpath_nodes import CommentNode, ProcessingInstructionNode  # noqa: F401
+    from .xpath_tokens import XPathToken, XPathAxis, XPathFunction  # noqa: F401
+    from .xpath_tokens import XPathConstructor, XPathMap, XPathArray  # noqa: F401
+    from .xpath_context import XPathContext, XPathSchemaContext  # noqa: F401
+    from .xpath1 import XPath1Parser  # noqa: F401
+    from .xpath2 import XPath2Parser  # noqa: F401
+    from .xpath30 import XPath30Parser  # noqa: F401
+    from .xpath31 import XPath31Parser  # noqa: F401
+
+###
+# Namespace maps
+NamespacesType = MutableMapping[str, str]
+NsmapType = MutableMapping[Optional[str], str]  # compatible with the nsmap of lxml Element
+AnyNsmapType = Union[NamespacesType, NsmapType, None]  # for composition and function arguments
+
+###
+# Datatypes
+NumericType = Union[int, float, Decimal]
+DateTimeType = Union[
+    'DateTime', 'Date', 'Time', 'GregorianYear', 'GregorianMonth',
+    'GregorianDay', 'GregorianYearMonth', 'GregorianMonthDay'
+]
+DurationType = Union['Duration', 'YearMonthDuration', 'DayTimeDuration']
+ArithmeticType = Union[NumericType, DateTimeType, 'DurationType', 'UntypedAtomic']
+AtomicType = Union['AnyAtomicType', str, bool, int, float, Decimal]
+
+###
+# XPath nodes
+TypedNodeType = Union['AttributeNode', 'ElementNode']
+TaggedNodeType = Union['ElementNode', 'CommentNode', 'ProcessingInstructionNode']
+ElementMapType = dict[object, TaggedNodeType]
+FindAttrType = Optional['XsdAttributeProtocol']
+FindElemType = Optional['XsdElementProtocol']
+RootNodeType = Union['DocumentNode', 'ElementNode']
+
+ParentNodeType = Union['DocumentNode', 'ElementNode']
+ChildNodeType = Union['TextNode', TaggedNodeType]
+
+# All possible variants for node as item
+XPathNodeType = Union['XPathNode', 'DocumentNode', 'NamespaceNode', 'AttributeNode',
+                      'TextNode', 'ElementNode', 'CommentNode', 'ProcessingInstructionNode']
+
+###
+# Sequence and item/value types (specifics and generics)
+ItemType = Union['XPathNode', AtomicType, 'XPathFunction']
+
+_T = TypeVar('_T', bound=ItemType)
+
+OneOrEmpty = Union[_T, list[_T], list[NoReturn]]
+OneOrMore = Union[_T, list[_T]]
+AnyOrEmpty = Union[_T, list[_T], list[NoReturn]]
+
+SequenceArgType = Union[
+    Iterator[_T], list[_T], list[NoReturn], tuple[_T, ...], tuple[_T], tuple[()]
+]
+
+OneAtomicOrEmpty = OneOrEmpty[AtomicType]
+OneNumericOrEmpty = OneOrEmpty[NumericType]
+OneArithmeticOrEmpty = OneOrEmpty[ArithmeticType]
+OneItemOrEmpty = OneOrEmpty[ItemType]
+
+OneOrMoreAtomic = OneOrMore[AtomicType]
+OneOrMoreNumeric = OneOrMore[NumericType]
+OneOrMoreArithmetic = OneOrMore[ArithmeticType]
+OneOrMoreItems = OneOrMore[ItemType]
+
+AnyAtomicOrEmpty = AnyOrEmpty[AtomicType]
+AnyNumericOrEmpty = AnyOrEmpty[NumericType]
+AnyArithmeticOrEmpty = AnyOrEmpty[ArithmeticType]
+AnyItemsOrEmpty = AnyOrEmpty[ItemType]
+
+ValueType = Union[ItemType, list[ItemType], list[NoReturn], list['XPathNode'],
+                  list[Union['AttributeNode', 'ElementNode']], list[AtomicType]]
+ListItemType = Union[ItemType, list[ItemType], list[NoReturn]]
+ResultType = Union[
+    AtomicType, 'ElementProtocol', 'XsdAttributeProtocol', tuple[Optional[str], str],
+    'DocumentProtocol', 'DocumentNode', 'XPathFunction', object
+]
+MapDictType = dict[Optional[AtomicType], ValueType]
+SequenceTypesType = Union[str, list[str], tuple[str, ...]]
+
+# Parsers and tokens
+XPathParserType = Union['XPath1Parser', 'XPath2Parser', 'XPath30Parser', 'XPath31Parser']
+XPathTokenType = Union['XPathToken', 'XPathAxis', 'XPathFunction', 'XPathConstructor']
+XPath2ParserType = Union['XPath2Parser', 'XPath30Parser', 'XPath31Parser']
+ParserClassType = Union[
+    type['XPath1Parser'], type['XPath2Parser'], type['XPath30Parser'], type['XPath31Parser']
+]
+NargsType = Optional[Union[int, tuple[int, Optional[int]]]]
+ClassCheckType = Union[type[Any], tuple[type[Any], ...]]
+
+# Context arguments
+ContextType = Union['XPathContext', 'XPathSchemaContext', None]
+RootArgType = Union['DocumentType', 'ElementType', 'SchemaElemType', RootNodeType]
+ItemArgType = Union[ItemType, 'ElementProtocol', 'DocumentProtocol']
+SchemaProxyType = Union['AbstractSchemaProxy']
+
+_S = TypeVar('_S', bound=ItemArgType)
+
+InputType = Union[None, _S, list[_S], list[NoReturn], tuple[_S, ...], tuple[_S], tuple[()]]
+VariableValueType = InputType[ItemArgType]
+FunctionArgType = Union[VariableValueType, ValueType]
+NodeArgType = Union['XPathNode', 'ElementProtocol', 'DocumentProtocol']
+CollectionArgType = InputType[NodeArgType]

{elementpath-5.0.4 → elementpath-5.1.1}/elementpath/collations.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c), 2022, SISSA (International School for Advanced Studies).
+# Copyright (c), 2022-2026, SISSA (International School for Advanced Studies).
 # All rights reserved.
 # This file is distributed under the terms of the MIT License.
 # See the file 'LICENSE' in the root directory of the present

{elementpath-5.0.4 → elementpath-5.1.1}/elementpath/compare.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c), 2022, SISSA (International School for Advanced Studies).
+# Copyright (c), 2022-2026, SISSA (International School for Advanced Studies).
 # All rights reserved.
 # This file is distributed under the terms of the MIT License.
 # See the file 'LICENSE' in the root directory of the present
@@ -171,10 +171,6 @@ def deep_equal(seq1: Iterable[Any],
     return True
 
 
-def is_empty_sequence(x: Any) -> bool:
-    return not x and isinstance(x, list)
-
-
 def deep_compare(obj1: Any,
                  obj2: Any,
                  collation: Optional[str] = None,
@@ -187,7 +183,7 @@ def deep_compare(obj1: Any,
     def iter_object(obj: Any) -> Iterator[Any]:
         if isinstance(obj, XPathArray):
             yield from obj.items()
-        elif isinstance(obj, (list, Iterator)):
+        elif isinstance(obj, list):
             yield from obj
         else:
             yield obj
@@ -241,11 +237,13 @@ def deep_compare(obj1: Any,
                     not isinstance(value2, XPathArray):
                 raise xpath_error('FOTY0013', token=token)
 
-            if (value1 is None) ^ (value2 is None):
-                return -1 if value1 is None else 1
+            if value1 is None or value1 == []:
+                if value2 is not None and value2 != []:
+                    return -1
 
-            if is_empty_sequence(value1) ^ is_empty_sequence(value2):
-                return -1 if is_empty_sequence(value1) else 1
+            if value2 is None or value2 == []:
+                if value1 is not None and value1 != []:
+                    return 1
 
             if isinstance(value1, XPathNode) ^ isinstance(value2, XPathNode):
                 msg = f"cannot compare {type(value1)} with {type(value2)}"
@@ -371,12 +369,12 @@ def get_key_function(collation: Optional[str] = None,
 
     def compare_func(obj1: Any, obj2: Any) -> int:
         if key_func is not None:
-            if isinstance(obj1, (list, Iterator)):
+            if isinstance(obj1, list):
                 obj1 = map(key_func, obj1)
             else:
                 obj1 = key_func(obj1)
 
-            if isinstance(obj2, (list, Iterator)):
+            if isinstance(obj2, list):
                 obj2 = map(key_func, obj2)
             else:
                 obj2 = key_func(obj2)

elementpath-5.1.1/elementpath/datatypes/__init__.py

@@ -0,0 +1,53 @@
+#
+# Copyright (c), 2018-2026, SISSA (International School for Advanced Studies).
+# All rights reserved.
+# This file is distributed under the terms of the MIT License.
+# See the file 'LICENSE' in the root directory of the present
+# distribution, or http://opensource.org/licenses/MIT.
+#
+# @author Davide Brunato <brunato@sissa.it>
+#
+"""
+XSD atomic datatypes subpackage. Includes a class for UntypedAtomic data and
+classes for other XSD built-in types. This subpackage raises only built-in
+exceptions in order to be reusable by other packages.
+"""
+from .any_types import builtin_atomic_types, AtomicTypeMeta, AnyType, \
+    AnySimpleType, AnyAtomicType
+from .numeric import Float, Float10, Integer, Int, Long, \
+    NegativeInteger, PositiveInteger, NonNegativeInteger, \
+    NonPositiveInteger, Short, Byte, UnsignedByte, UnsignedInt, \
+    UnsignedLong, UnsignedShort
+from .untyped import UntypedAtomic
+from .qname import AbstractQName, QName, Notation
+from .string import NormalizedString, XsdToken, Name, NCName, \
+    NMToken, Id, Idref, Language, Entity
+from .lists import builtin_list_types, ListType, NMTokens, Idrefs, Entities
+from .uri import AnyURI
+from .binary import AbstractBinary, Base64Binary, HexBinary
+from .datetime import AbstractDateTime, DateTime10, DateTime, DateTimeStamp, \
+    Date10, Date, GregorianDay, GregorianMonth, GregorianYear, GregorianYear10, \
+    GregorianMonthDay, GregorianYearMonth, GregorianYearMonth10, Time, Timezone, \
+    Duration, DayTimeDuration, YearMonthDuration
+from .proxies import ErrorProxy, BooleanProxy, DecimalProxy, DoubleProxy, \
+    DoubleProxy10, StringProxy, NumericProxy, ArithmeticProxy
+from ..sequences import XSequence
+
+###
+# Alias kept for backward compatibility, will be removed in v6.0.
+OrderedDateTime = AbstractDateTime
+
+__all__ = ['AbstractBinary', 'AbstractDateTime', 'ListType', 'AbstractQName',
+           'AnyAtomicType', 'AnyURI', 'ArithmeticProxy', 'AtomicTypeMeta', 'Base64Binary',
+           'BooleanProxy', 'AtomicTypeMeta', 'Byte', 'Date', 'Date10', 'DateTime',
+           'DateTime10', 'DateTimeStamp', 'DayTimeDuration', 'DecimalProxy', 'DoubleProxy',
+           'DoubleProxy10', 'Duration', 'Entities', 'Entity', 'ErrorProxy',
+           'Float', 'Float10', 'GregorianDay', 'GregorianMonth', 'GregorianMonthDay',
+           'GregorianYear', 'GregorianYear10', 'GregorianYearMonth', 'GregorianYearMonth10',
+           'HexBinary', 'Id', 'Idref', 'Idrefs', 'Int', 'Integer', 'Language', 'Long',
+           'NCName', 'NMToken', 'NMTokens', 'Name', 'NegativeInteger', 'NonNegativeInteger',
+           'NonPositiveInteger', 'NormalizedString', 'Notation', 'NumericProxy',
+           'OrderedDateTime', 'PositiveInteger', 'QName', 'Short', 'StringProxy', 'Time',
+           'Timezone', 'UnsignedByte', 'UnsignedInt', 'UnsignedLong', 'UnsignedShort',
+           'UntypedAtomic', 'XsdToken', 'YearMonthDuration', 'ListType', 'XSequence',
+           'builtin_atomic_types', 'builtin_list_types', 'AnyType', 'AnySimpleType']