elementpath 5.0.2__tar.gz → 5.0.3__tar.gz

{elementpath-5.0.2 → elementpath-5.0.3}/CHANGELOG.rst

@@ -2,6 +2,10 @@
 CHANGELOG
 *********
 
+`v5.0.3`_ (2025-06-28)
+======================
+* Fix for XPath 1.0 processing of schema annotated XML data (issue #93)
+
 `v5.0.2`_ (2025-06-18)
 ======================
 * Fix for XPath 2.0 *fn:node-name* (issue #91)
@@ -513,3 +517,4 @@ CHANGELOG
 .. _v5.0.0: https://github.com/sissaschool/elementpath/compare/v4.8.0...v5.0.0
 .. _v5.0.1: https://github.com/sissaschool/elementpath/compare/v5.0.0...v5.0.1
 .. _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

{elementpath-5.0.2/elementpath.egg-info → elementpath-5.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: elementpath
-Version: 5.0.2
+Version: 5.0.3
 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.0.2 → elementpath-5.0.3}/doc/conf.py

@@ -31,7 +31,7 @@ author = 'Davide Brunato'
 # The short X.Y version
 version = '5.0'
 # The full version, including alpha/beta/rc tags
-release = '5.0.2'
+release = '5.0.3'
 
 # -- General configuration ---------------------------------------------------
 

{elementpath-5.0.2 → elementpath-5.0.3}/elementpath/__init__.py

@@ -7,7 +7,7 @@
 #
 # @author Davide Brunato <brunato@sissa.it>
 #
-__version__ = '5.0.2'
+__version__ = '5.0.3'
 __author__ = "Davide Brunato"
 __contact__ = "brunato@sissa.it"
 __copyright__ = "Copyright 2018-2025, SISSA"

{elementpath-5.0.2 → elementpath-5.0.3}/elementpath/tree_builders.py

@@ -7,6 +7,7 @@
 #
 # @author Davide Brunato <brunato@sissa.it>
 #
+from collections import deque
 from collections.abc import Iterator
 from typing import cast, Any, Optional, Union
 
@@ -139,8 +140,8 @@ def build_node_tree(root: ElementTreeRootType,
         position += 1
 
     children = iter(elem)
-    iterators: list[Any] = []
-    ancestors: list[Any] = []
+    iterators: deque[Any] = deque()
+    ancestors: deque[Any] = deque()
     parent = root_node
 
     while True:
@@ -270,8 +271,8 @@ def build_lxml_node_tree(root: LxmlRootType,
         position += 1
 
     children = iter(root_elem)
-    iterators: list[Any] = []
-    ancestors: list[Any] = []
+    iterators: deque[Any] = deque()
+    ancestors: deque[Any] = deque()
     parent = root_node
 
     while True:

{elementpath-5.0.2 → elementpath-5.0.3}/elementpath/xpath_nodes.py

@@ -194,6 +194,10 @@ class XPathNode:
         """Access to wrapped object using the old API."""
         return self.obj
 
+    @property
+    def compat_string_value(self) -> str:
+        return self.string_value
+
     @property
     def root_node(self) -> 'XPathNode':
         return self if self.parent is None else self.parent.tree.root_node
@@ -1178,10 +1182,14 @@ class EtreeElementNode(ElementNode):
         else:
             yield from get_atomic_sequence(self.xsd_type, '')
 
+    @property
+    def compat_string_value(self) -> str:
+        return ''.join(etree_iter_strings(self.obj))
+
     def apply_schema(self, schema: 'AbstractSchemaProxy') -> None:
-        if self.schema is schema and not schema.is_assertion_based():
+        if self.tree.schema is schema and not schema.is_assertion_based():
             return
-        self.schema = schema
+        self.tree.schema = schema
 
         if not schema.is_fully_valid():
             element_type = schema.get_type(XSD_ANY_TYPE)
@@ -1214,7 +1222,7 @@ class EtreeElementNode(ElementNode):
             xsd_types = [None]
             children = iter((root_node,))
 
-        iterators: list[Any] = []
+        iterators: deque[Any] = deque()
         while True:
             for elem in children:
                 if not isinstance(elem, EtreeElementNode):
@@ -1734,6 +1742,12 @@ class EtreeDocumentNode(DocumentNode):
             return ''.join(etree_iter_strings(root))
         return ''.join(child.string_value for child in self.children)
 
+    @property
+    def compat_string_value(self) -> str:
+        if not self.children:
+            return self.string_value
+        return ''.join(child.compat_string_value for child in self.children)
+
     @property
     def is_extended(self) -> bool:
         """

{elementpath-5.0.2 → elementpath-5.0.3}/elementpath/xpath_tokens.py

@@ -119,7 +119,7 @@ class XPathToken(Token[XPathTokenType]):
         if self.symbol == '$':
             return '$%s variable reference' % (self[0].value if self._items else '')
         elif self.symbol == ',':
-            return 'comma operator' if self.parser.version > '1.0' else 'comma symbol'
+            return 'comma operator' if self.parser.version != '1.0' else 'comma symbol'
         elif self.symbol == '(':
             if not self or self[0].span[0] >= self.span[0]:
                 return 'parenthesized expression'
@@ -434,14 +434,18 @@ class XPathToken(Token[XPathTokenType]):
         if item is None:
             return
         elif isinstance(item, XPathNode):
-            value = None
-            for value in item.iter_typed_values:
+            if self.parser.version != '1.0':
+                value = None
+                for value in item.iter_typed_values:
+                    yield value
+
+                if value is None:
+                    msg = f"argument node {item!r} does not have a typed value"
+                    raise self.error('FOTY0012', msg)
+            else:
+                value = item.compat_string_value
                 yield value
 
-            if value is None:
-                msg = f"argument node {item!r} does not have a typed value"
-                raise self.error('FOTY0012', msg)
-
         elif isinstance(item, list):
             for v in item:
                 yield from self.atomize_item(v)
@@ -913,6 +917,8 @@ class XPathToken(Token[XPathTokenType]):
         if obj is None:
             return ''
         elif isinstance(obj, XPathNode):
+            if self.parser.version == '1.0':
+                return obj.compat_string_value
             return obj.string_value
         elif isinstance(obj, bool):
             return 'true' if obj else 'false'
@@ -951,7 +957,9 @@ class XPathToken(Token[XPathTokenType]):
         """
         try:
             if isinstance(obj, XPathNode):
-                return get_double(self.string_value(obj), self.parser.xsd_version)
+                if self.parser.version == '1.0':
+                    return get_double(obj.compat_string_value, self.parser.xsd_version)
+                return get_double(obj.string_value, self.parser.xsd_version)
             else:
                 return get_double(obj, self.parser.xsd_version)
         except (TypeError, ValueError):

{elementpath-5.0.2 → elementpath-5.0.3/elementpath.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: elementpath
-Version: 5.0.2
+Version: 5.0.3
 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.0.2 → elementpath-5.0.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "elementpath"
-version = "5.0.2"
+version = "5.0.3"
 description = "XPath 1.0/2.0/3.0/3.1 parsers and selectors for ElementTree and lxml"
 readme = "README.rst"
 license = "MIT"

{elementpath-5.0.2 → elementpath-5.0.3}/tests/test_xpath1_parser.py

@@ -33,6 +33,11 @@ try:
 except ImportError:
     lxml_etree = None
 
+try:
+    import xmlschema
+except ImportError:
+    xmlschema = None
+
 from elementpath import datatypes, XPath1Parser, XPathContext, MissingContextError, \
     NamespaceNode, TextNode, CommentNode, ProcessingInstructionNode, select, XPathFunction
 from elementpath.xpath_nodes import TextAttributeNode, EtreeElementNode
@@ -1719,6 +1724,40 @@ class XPath1ParserTest(xpath_test_class.XPathTestCase):
         token = parser.parse("//eg:q1[1] = //eg:q1[2]")
         self.assertIs(token.evaluate(context), False)
 
+    @unittest.skipIf(xmlschema is None, "XPath schema not available")
+    def test_issue_093_with_schema(self):
+        xml_data = dedent("""\
+            <container xmlns="http://www.w3.org/example">
+                <q1 xmlns:a="http://www.w3.org/test">a:blah</q1>
+                <q1 xmlns:b="http://www.w3.org/test">b:blah</q1>
+            </container>""")
+
+        xsd_schema = dedent("""
+            <schema xmlns="http://www.w3.org/2001/XMLSchema"
+                        targetNamespace="http://www.w3.org/example">
+                <element id="container" name="container"/>
+                <element id="q1" name="q1" type="QName"/>
+            </schema>""")
+
+        schema = xmlschema.XMLSchema10(xsd_schema)
+        schema.validate(xml_data)
+
+        resource = xmlschema.XMLResource(xml_data)
+
+        resource.xpath_root.get_document_node(replace=False).apply_schema(schema.xpath_proxy)
+
+        root = self.etree.fromstring(xml_data)
+        namespaces = resource.get_namespaces(root_only=False)
+        context = XPathContext(root, schema=schema.xpath_proxy, namespaces=namespaces)
+
+        parser = self.parser.__class__(namespaces={"eg": "http://www.w3.org/example"})
+        token = parser.parse("//eg:q1[1] = //eg:q1[2]")
+
+        if self.parser.version == "1.0":
+            self.assertIs(token.evaluate(context), False)
+        else:
+            self.assertIs(token.evaluate(context), True)
+
 
 @unittest.skipIf(lxml_etree is None, "The lxml library is not installed")
 class LxmlXPath1ParserTest(XPath1ParserTest):

{elementpath-5.0.2 → elementpath-5.0.3}/tests/test_xpath_tokens.py

@@ -334,7 +334,9 @@ class XPath1TokenTest(unittest.TestCase):
             typed_elem = EtreeElementNode(elem=element)
             setattr(typed_elem, 'xsd_type', xsd_type)
             self.assertEqual(token.string_value(typed_elem), '10')
-            self.assertEqual(token.data_value(typed_elem), 10)
+
+            value = '10' if self.parser.version == '1.0' else 10
+            self.assertEqual(token.data_value(typed_elem), value)
 
     def test_number_value_function(self):
         token = self.parser.parse('true()')

{elementpath-5.0.2 → elementpath-5.0.3}/tox.ini

@@ -56,7 +56,7 @@ commands =
 
 [testenv:mypy-py{39,310,311,312,313,314,py3}]
 deps =
-    mypy==1.16.0
+    mypy==1.16.1
     xmlschema~=4.1.0
     lxml-stubs
 commands =
@@ -86,7 +86,7 @@ set_env =
     xmlschema410: VERSION = 4.1.0
 change_dir = {env_tmp_dir}
 deps =
-    mypy==1.16.0
+    mypy==1.16.1
     lxml
     lxml-stubs
     jinja2