elementpath 5.1.0__tar.gz → 5.1.2__tar.gz

{elementpath-5.1.0 → elementpath-5.1.2}/CHANGELOG.rst

@@ -2,6 +2,16 @@
 CHANGELOG
 *********
 
+`v5.1.2`_ (2026-06-13)
+======================
+* Include PR #101 (invalid sequence type error code for external functions)
+* Fix issues #100 and #102
+
+`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
@@ -531,3 +541,5 @@ CHANGELOG
 .. _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
+.. _v5.1.2: https://github.com/sissaschool/elementpath/compare/v5.1.1...v5.1.2

{elementpath-5.1.0 → elementpath-5.1.2}/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c), 2018-2025, 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.1.0/elementpath.egg-info → elementpath-5.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: elementpath
-Version: 5.1.0
+Version: 5.1.2
 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

{elementpath-5.1.0 → elementpath-5.1.2}/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.1'
 # The full version, including alpha/beta/rc tags
-release = '5.1.0'
+release = '5.1.2'
 
 # -- General configuration ---------------------------------------------------
 

{elementpath-5.1.0 → elementpath-5.1.2}/elementpath/__init__.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c), 2018-2025, 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.1.0'
+__version__ = '5.1.2'
 __author__ = "Davide Brunato"
 __contact__ = "brunato@sissa.it"
-__copyright__ = "Copyright 2018-2025, SISSA"
+__copyright__ = "Copyright 2018-2026, SISSA"
 __license__ = "MIT"
 __status__ = "Production/Stable"
 

{elementpath-5.1.0 → elementpath-5.1.2}/elementpath/aliases.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c), 2025-2025, SISSA (International School for Advanced Studies).
+# 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

{elementpath-5.1.0 → elementpath-5.1.2}/elementpath/collations.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c), 2022-2025, 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.1.0 → elementpath-5.1.2}/elementpath/compare.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c), 2022-2025, 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.1.0 → elementpath-5.1.2}/elementpath/datatypes/__init__.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c), 2018-2025, 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

{elementpath-5.1.0 → elementpath-5.1.2}/elementpath/datatypes/any_types.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c), 2018-2025, 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,6 +7,7 @@
 #
 # @author Davide Brunato <brunato@sissa.it>
 #
+import sys
 from abc import ABCMeta, abstractmethod
 from types import MappingProxyType
 from typing import Any
@@ -58,7 +59,7 @@ class AtomicTypeMeta(ABCMeta):
             extended_name = f'{{{namespace}}}{name}' if namespace else name
             prefixed_name = f'{prefix}:{name}' if prefix else name
 
-            if not cls.__doc__:
+            if not cls.__doc__ and sys.flags.optimize < 2:
                 if ver := getattr(cls, '_xsd_version', ''):
                     ver = ver + ' '
                 params = getattr(cls, '__init__', None).__doc__ or ''

{elementpath-5.1.0 → elementpath-5.1.2}/elementpath/datatypes/binary.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c), 2018-2025, 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

{elementpath-5.1.0 → elementpath-5.1.2}/elementpath/datatypes/datetime.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c), 2018-2025, 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

{elementpath-5.1.0 → elementpath-5.1.2}/elementpath/datatypes/lists.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c), 2018-2025, 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

{elementpath-5.1.0 → elementpath-5.1.2}/elementpath/datatypes/numeric.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c), 2018-2025, 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

{elementpath-5.1.0 → elementpath-5.1.2}/elementpath/datatypes/proxies.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c), 2018-2025, 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

{elementpath-5.1.0 → elementpath-5.1.2}/elementpath/datatypes/qname.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c), 2018-2025, 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

{elementpath-5.1.0 → elementpath-5.1.2}/elementpath/datatypes/string.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c), 2018-2025, 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

{elementpath-5.1.0 → elementpath-5.1.2}/elementpath/datatypes/untyped.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c), 2018-2025, 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
@@ -32,7 +32,7 @@ class UntypedAtomic(AnyAtomicType):
     name = 'untypedAtomic'
     value: str
 
-    __slots__ = ('value', '_xsd_version', 'parser')
+    __slots__ = ('value', 'parser')
 
     @classmethod
     def make(cls, value: Any, **kwargs: Any) -> 'UntypedAtomic':

{elementpath-5.1.0 → elementpath-5.1.2}/elementpath/datatypes/uri.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c), 2018-2025, 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

{elementpath-5.1.0 → elementpath-5.1.2}/elementpath/decoder.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c), 2024-2025, SISSA (International School for Advanced Studies).
+# Copyright (c), 2024-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.1.0 → elementpath-5.1.2}/elementpath/etree.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c), 2016-2025, SISSA (International School for Advanced Studies).
+# Copyright (c), 2016-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.1.0 → elementpath-5.1.2}/elementpath/exceptions.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c), 2018-2025, 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

{elementpath-5.1.0 → elementpath-5.1.2}/elementpath/extras/pathnodes.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c), 2025, SISSA (International School for Advanced Studies).
+# 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

{elementpath-5.1.0 → elementpath-5.1.2}/elementpath/helpers.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c), 2018-2025, 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
@@ -112,6 +112,13 @@ class LazyPattern:
             self._compiled = re.compile(self._pattern, self._flags)
             return self._compiled.search(string)
 
+    def split(self, string: str) -> list[str]:
+        try:
+            return self._compiled.split(string)
+        except AttributeError:
+            self._compiled = re.compile(self._pattern, self._flags)
+            return self._compiled.split(string)
+
 
 class Patterns:
     """

{elementpath-5.1.0 → elementpath-5.1.2}/elementpath/namespaces.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c), 2018-2025, 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

{elementpath-5.1.0 → elementpath-5.1.2}/elementpath/protocols.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c), 2021-2025, SISSA (International School for Advanced Studies).
+# Copyright (c), 2021-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.1.0 → elementpath-5.1.2}/elementpath/regex/__init__.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c), 2018-2025, 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

{elementpath-5.1.0 → elementpath-5.1.2}/elementpath/regex/categories_fallback.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c), 2025, SISSA (International School for Advanced Studies).
+# 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

{elementpath-5.1.0 → elementpath-5.1.2}/elementpath/regex/character_classes.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c), 2016-2025, SISSA (International School for Advanced Studies).
+# Copyright (c), 2016-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
@@ -14,6 +14,7 @@ from collections.abc import Callable, Iterator, MutableSet
 from itertools import chain
 from typing import AbstractSet, Any, Optional, Union
 
+from elementpath.helpers import LazyPattern
 from .codepoints import RegexError
 from .unicode_subsets import UnicodeSubset, lazy_subset, unicode_subset, unicode_category
 
@@ -87,6 +88,29 @@ CHARACTER_ESCAPES: dict[str, Union[str, Callable[[], UnicodeSubset]]] = {
     '\\W': w_shortcut,
 }
 
+re_char_set = LazyPattern(r'(\\[nrt|.\-^?*+{}()\]sSdDiIcCwW]|\\[pP]{[a-zA-Z\-0-9]+})')
+
+
+def get_charset_parts(charset: str) -> list[str]:
+    parts: list[str] = []
+    prev = ''
+    for part in re_char_set.split(charset):
+        if not part:
+            continue
+        elif part.endswith('-') and part != '\\-':
+            prev = part
+        elif part.startswith('-') and parts:
+            parts[-1] += prev + part
+            prev = ''
+        else:
+            parts.append(prev + part)
+            prev = ''
+    else:
+        if prev:
+            parts.append(prev)
+
+    return parts
+
 
 class CharacterClass(MutableSet[int]):
     """
@@ -96,7 +120,7 @@ class CharacterClass(MutableSet[int]):
     :param xsd_version: the reference XSD version for syntax variants. Defaults to '1.0'.
     TODO: implement __ior__, __iand__, __ixor__ operators for a full mutable set class.
     """
-    _re_char_set = re.compile(r'(?<!.-)(\\[nrt|.\-^?*+{}()\]sSdDiIcCwW]|\\[pP]{[a-zA-Z\-0-9]+})')
+    _re_char_set = re.compile(r'(\\[nrt|.\-^?*+{}()\]sSdDiIcCwW]|\\[pP]{[a-zA-Z\-0-9]+})')
     _re_unicode_ref = re.compile(r'\\([pP]){([\w-]+)}')
 
     __slots__ = 'xsd_version', 'positive', 'negative'
@@ -172,7 +196,7 @@ class CharacterClass(MutableSet[int]):
         if isinstance(charset, int):
             charset = chr(charset)
 
-        for part in self._re_char_set.split(charset):
+        for part in get_charset_parts(charset):
             if part in CHARACTER_ESCAPES:
                 value = CHARACTER_ESCAPES[part]
                 if isinstance(value, str):
@@ -204,7 +228,7 @@ class CharacterClass(MutableSet[int]):
         if isinstance(charset, int):
             charset = chr(charset)
 
-        for part in self._re_char_set.split(charset):
+        for part in get_charset_parts(charset):
             if part in CHARACTER_ESCAPES:
                 value = CHARACTER_ESCAPES[part]
                 if isinstance(value, str):

{elementpath-5.1.0 → elementpath-5.1.2}/elementpath/regex/codepoints.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c), 2016-2025, SISSA (International School for Advanced Studies).
+# Copyright (c), 2016-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.1.0 → elementpath-5.1.2}/elementpath/regex/patterns.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c), 2016-2025, SISSA (International School for Advanced Studies).
+# Copyright (c), 2016-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.1.0 → elementpath-5.1.2}/elementpath/regex/unicode_blocks.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c), 2018-2025, 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

{elementpath-5.1.0 → elementpath-5.1.2}/elementpath/regex/unicode_categories.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c), 2018-2025, 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

{elementpath-5.1.0 → elementpath-5.1.2}/elementpath/regex/unicode_subsets.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c), 2016-2025, SISSA (International School for Advanced Studies).
+# Copyright (c), 2016-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.1.0 → elementpath-5.1.2}/elementpath/schema_proxy.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c), 2018-2025, 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

{elementpath-5.1.0 → elementpath-5.1.2}/elementpath/sequence_types.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c), 2018-2025, 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
@@ -15,7 +15,7 @@ import elementpath.aliases as ta
 
 from elementpath.datatypes import builtin_atomic_types, builtin_list_types, QName, \
     NumericProxy, AnyAtomicType
-from elementpath.exceptions import ElementPathKeyError, xpath_error
+from elementpath.exceptions import ElementPathKeyError, ElementPathValueError, xpath_error
 from elementpath.namespaces import XSD_NAMESPACE, XSD_ERROR, XSD_DATETIME_STAMP, \
     XSD_NUMERIC, XSD_UNTYPED, XSD_UNTYPED_ATOMIC, get_expanded_name
 from elementpath.helpers import collapse_white_spaces, Patterns
@@ -36,6 +36,53 @@ XSD11_ONLY_TYPES = frozenset(
 )
 
 
+def get_function_signatures(qname: QName,
+                            nargs: ta.NargsType,
+                            sequence_types: tuple[str, ...] = ()) -> dict[tuple[QName, int], str]:
+    """
+    Returns the signatures for a function.
+
+    :param qname: A QName instance that represents the FQDN of the function.
+    :param nargs: The number of arguments that the function takes, could the `None`, \
+    a non-negative integer or a couple non-negative integers or a non-negative integer \
+    followed by `None`.
+    :param sequence_types: A sequence of sequence type specifications, must match \
+    the number of arguments that the function takes plus the return type.
+    """
+    function_signatures: dict[tuple[QName, int], str] = {}
+    if not sequence_types:
+        return function_signatures
+
+    if any(not is_sequence_type(st) for st in sequence_types):
+        msg = "Error in provided sequence types: {!r}"
+        raise ElementPathValueError(msg.format(sequence_types))
+    elif nargs is None:
+        if len(sequence_types) != 1:
+            raise ElementPathValueError("Mismatched number of sequence types provided")
+        function_signatures[(qname, 0)] = f'function() as {sequence_types[0]}'
+    elif isinstance(nargs, int):
+        if len(sequence_types) != nargs + 1:
+            raise ElementPathValueError("Mismatched number of sequence types provided")
+        function_signatures[(qname, nargs)] = 'function({}) as {}'.format(
+            ', '.join(sequence_types[:-1]), sequence_types[-1]
+        )
+    elif nargs[1] is None:
+        if len(sequence_types) != nargs[0] + 1:
+            raise ElementPathValueError("Mismatched number of sequence types provided")
+        function_signatures[(qname, nargs[0])] = 'function({}, ...) as {}'.format(
+            ', '.join(sequence_types[:-1]), sequence_types[-1]
+        )
+    else:
+        if len(sequence_types) != nargs[1] + 1:
+            raise ElementPathValueError("Mismatched number of sequence types provided")
+        for arity in range(nargs[0], nargs[1] + 1):
+            function_signatures[(qname, arity)] = 'function({}) as {}'.format(
+                ', '.join(sequence_types[:arity]), sequence_types[-1]
+            )
+
+    return function_signatures
+
+
 ###
 # Sequence type checking
 @cache

{elementpath-5.1.0 → elementpath-5.1.2}/elementpath/sequences.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c), 2018-2025, 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

{elementpath-5.1.0 → elementpath-5.1.2}/elementpath/serialization.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c), 2022-2025, 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
@@ -38,6 +38,31 @@ SER_PARAM_STANDALONE = '{%s}standalone' % XSLT_XQUERY_SERIALIZATION_NAMESPACE
 SER_PARAM_ITEM_SEPARATOR = '{%s}item-separator' % XSLT_XQUERY_SERIALIZATION_NAMESPACE
 
 
+class MapEncodingDict(dict[AnyAtomicType | None, Any]):
+    """
+    A bridge dict-type for encoding XPath maps to JSON.
+    """
+    def __init__(self, items: Any) -> None:
+        self[None] = None
+        self._items = items
+
+    def __getitem__(self, key: AnyAtomicType | None, /) -> Any:
+        for k, v in self._items:
+            if key == k:
+                return v
+        raise KeyError(key)
+
+    def __iter__(self) -> Iterator[AnyAtomicType | None]:
+        for k, _ in self._items:
+            yield k
+
+    def __len__(self) -> int:
+        return len(self._items)
+
+    def items(self) -> Any:
+        return self._items
+
+
 def get_serialization_params(params: Union[None, ElementNode, XPathMap] = None,
                              token: Optional[XPathToken] = None) -> dict['str', Any]:
 
@@ -337,14 +362,6 @@ def serialize_to_json(elements: Iterable[Any],
     if etree_module is None:
         etree_module = ElementTree
 
-    class MapEncodingDict(dict):  # type: ignore[type-arg]
-        def __init__(self, items: Any) -> None:
-            self[None] = None
-            self._items = items
-
-        def items(self) -> Any:
-            return self._items
-
     class XPathEncoder(json.JSONEncoder):
 
         def default(self, obj: Any) -> Any:

{elementpath-5.1.0 → elementpath-5.1.2}/elementpath/tdop.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c), 2018-2025, 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
@@ -14,9 +14,9 @@ import sys
 import re
 from abc import ABCMeta
 from collections.abc import Callable, Iterator, MutableMapping, MutableSequence
-from unicodedata import name as unicode_name
 from decimal import Decimal, DecimalException
 from typing import Any, cast, overload, Generic, TypeVar
+from unicodedata import name as unicode_name
 
 #
 # Simple top-down parser based on Vaughan Pratt's algorithm (Top Down Operator Precedence).
@@ -49,7 +49,7 @@ class ParseError(SyntaxError):
     """An error when parsing source with TDOP parser."""
 
 
-def _symbol_to_classname(symbol: str) -> str:
+def symbol_to_classname(symbol: str) -> str:
     """
     Converts a symbol string to an identifier (only alphanumeric and '_').
     """
@@ -693,7 +693,7 @@ class Parser(Generic[TK_co], metaclass=ParserMeta):
                     token_class_name = kwargs.pop('class_name')
                 else:
                     token_class_name = "_%s%s" % (
-                        _symbol_to_classname(symbol),
+                        symbol_to_classname(symbol),
                         str(label).title().replace(' ', '')
                     )
 
@@ -713,8 +713,13 @@ class Parser(Generic[TK_co], metaclass=ParserMeta):
             raise TypeError("A string or a %r subclass requested, not %r." % (Token, symbol))
         else:
             token_class = symbol
-            if cls.symbol_table.get(symbol.lookup_name) is not token_class:
-                raise ValueError("Token class %r is not registered." % token_class)
+            lookup_name = token_class.lookup_name
+
+            if lookup_name not in cls.symbol_table:
+                cls.symbol_table[lookup_name] = token_class
+            elif cls.symbol_table[lookup_name] is not token_class:
+                msg = "Token class {!r} collide on key {!r} with a different token class."
+                raise ValueError(msg.format(token_class, lookup_name))
 
         for key, value in kwargs.items():
             if key == 'lbp' and value > token_class.lbp:

{elementpath-5.1.0 → elementpath-5.1.2}/elementpath/tree_builders.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c), 2018-2025, 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

{elementpath-5.1.0 → elementpath-5.1.2}/elementpath/validators/__init__.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c), 2018-2025, 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

{elementpath-5.1.0 → elementpath-5.1.2}/elementpath/xpath1/__init__.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c), 2018-2025, 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

{elementpath-5.1.0 → elementpath-5.1.2}/elementpath/xpath1/_xpath1_axes.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c), 2018-2025, 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