elementpath 5.0.3__tar.gz → 5.0.4__tar.gz

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

@@ -2,6 +2,10 @@
 CHANGELOG
 *********
 
+`v5.0.4`_ (2025-08-16)
+======================
+* Fix default/fixed values processing of schema annotated XML data (issue #94)
+
 `v5.0.3`_ (2025-06-28)
 ======================
 * Fix for XPath 1.0 processing of schema annotated XML data (issue #93)
@@ -518,3 +522,4 @@ CHANGELOG
 .. _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
+.. _v5.0.4: https://github.com/sissaschool/elementpath/compare/v5.0.3...v5.0.4

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: elementpath
-Version: 5.0.3
+Version: 5.0.4
 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.3 → elementpath-5.0.4}/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.3'
+release = '5.0.4'
 
 # -- General configuration ---------------------------------------------------
 

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

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

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

@@ -83,7 +83,7 @@ def deep_equal(seq1: Iterable[Any],
                     return False
                 elif isinstance(value1, etree_node_types):
                     assert isinstance(value2, etree_node_types)
-                    if not etree_deep_equal(value1.obj, value2.obj):
+                    if not etree_deep_equal(value1.value, value2.value):
                         return False
                 elif isinstance(value1, EtreeDocumentNode):
                     assert isinstance(value2, EtreeDocumentNode)
@@ -94,14 +94,14 @@ def deep_equal(seq1: Iterable[Any],
                             return False
                         elif isinstance(child1, etree_node_types):
                             assert isinstance(child2, etree_node_types)
-                            if not etree_deep_equal(child1.obj, child2.obj):
+                            if not etree_deep_equal(child1.value, child2.value):
                                 return False
                         elif isinstance(child1, TextNode):
                             assert isinstance(child2, TextNode)
-                            if cm.ne(child1.obj, child2.obj):
+                            if cm.ne(child1.value, child2.value):
                                 return False
 
-                elif cm.ne(value1.obj, value2.obj):
+                elif cm.ne(value1.value, value2.value):
                     return False
                 elif isinstance(value1, TextAttributeNode):
                     if cm.ne(value1.name, value2.name):
@@ -257,7 +257,7 @@ def deep_compare(obj1: Any,
                     raise xpath_error('XPTY0004', msg, token=token)
                 elif isinstance(value1, etree_node_types):
                     assert isinstance(value2, etree_node_types)
-                    result = etree_deep_compare(value1.obj, value2.obj)
+                    result = etree_deep_compare(value1.value, value2.value)
                     if result:
                         return result
                 elif isinstance(value1, EtreeDocumentNode):
@@ -272,19 +272,19 @@ def deep_compare(obj1: Any,
                             raise xpath_error('XPTY0004', msg, token=token)
                         elif isinstance(child1, etree_node_types):
                             assert isinstance(child2, etree_node_types)
-                            result = etree_deep_compare(child1.obj, child2.obj)
+                            result = etree_deep_compare(child1.value, child2.value)
                             if result:
                                 return result
                         elif isinstance(child1, TextNode):
                             assert isinstance(child2, TextNode)
                             result = cm.strcoll(
-                                child1.obj.strip(), child2.obj.strip()
+                                child1.value.strip(), child2.value.strip()
                             )
                             if result:
                                 return result
                 elif isinstance(value1, TextNode):
                     assert isinstance(value2, TextNode)
-                    result = cm.strcoll(value1.obj, value2.obj)
+                    result = cm.strcoll(value1.value, value2.value)
                     if result:
                         return result
                 elif isinstance(value1, TextAttributeNode):

{elementpath-5.0.3 → elementpath-5.0.4}/elementpath/extras/pathnodes.py

@@ -24,7 +24,7 @@ from elementpath.datatypes import DateTime, AtomicType
 
 class PathElementNode(ElementNode):
     name: str
-    obj: Path
+    value: Path
     xsd_element: Optional[XsdElementProtocol]
 
     __slots__ = ('stat',)
@@ -53,7 +53,7 @@ class PathElementNode(ElementNode):
             self.parent = parent
 
         self.name = path.name
-        self.obj = path
+        self.value = path
         self.stat = path.stat()
         self.position = self.stat.st_ino
         self.children = []
@@ -63,9 +63,9 @@ class PathElementNode(ElementNode):
 
     @property
     def content(self) -> Path:
-        return self.obj
+        return self.value
 
-    elem = value = content
+    elem = content
 
     @property
     def attributes(self) -> list[AttributeNode]:
@@ -101,10 +101,10 @@ class PathElementNode(ElementNode):
 
     @property
     def string_value(self) -> str:
-        if self.obj.is_dir():
+        if self.value.is_dir():
             return ''
-        if self.obj.is_file():
-            return self.obj.read_text()
+        if self.value.is_file():
+            return self.value.read_text()
         else:
             return ''
 
@@ -125,12 +125,12 @@ class PathElementNode(ElementNode):
             return self.name == f'{{{default_namespace}}}{name}'
 
     def get_document_node(self, replace: bool = True, as_parent: bool = True) -> 'DocumentNode':
-        return PathDocumentNode(Path(self.obj.absolute().root))
+        return PathDocumentNode(Path(self.value.absolute().root))
 
     def __iter__(self) -> Iterator[ChildNodeType]:
         if not self.children:
-            if self.obj.is_dir():
-                for path in self.obj.iterdir():
+            if self.value.is_dir():
+                for path in self.value.iterdir():
                     if path in self.tree.elements:
                         self.children.append(self.tree.elements[path])
                     else:
@@ -150,7 +150,7 @@ class PathElementNode(ElementNode):
 
 
 class PathDocumentNode(DocumentNode):
-    obj: Path
+    value: Path
 
     __slots__ = ('stat',)
 
@@ -159,7 +159,7 @@ class PathDocumentNode(DocumentNode):
         if not document.is_dir() or len(document.parts) > 1 or not document.is_absolute():
             raise ValueError(f'{document} must be a root directory')
 
-        self.obj = document
+        self.value = document
         self.name = None
         self.parent = None
         self.position = document.stat().st_ino
@@ -168,15 +168,15 @@ class PathDocumentNode(DocumentNode):
 
     @property
     def document(self) -> Path:
-        return self.obj
+        return self.value
 
     @property
     def string_value(self) -> str:
-        return self.obj.read_text()
+        return self.value.read_text()
 
     def __iter__(self) -> Iterator[ChildNodeType]:
         if not self.children:
-            for path in self.obj.iterdir():
+            for path in self.value.iterdir():
                 if path in self.tree.elements:
                     self.children.append(self.tree.elements[path])
                 else:
@@ -187,7 +187,7 @@ class PathDocumentNode(DocumentNode):
 
 class IntAttributeNode(AttributeNode):
     name: str
-    obj: int
+    value: int
     parent: Optional['PathElementNode']
 
     __slots__ = ()
@@ -198,22 +198,18 @@ class IntAttributeNode(AttributeNode):
                  parent: Optional['PathElementNode'] = None) -> None:
 
         self.name = name
-        self.obj = value
+        self.value = value
         self.parent = parent
         self.position = parent.position if parent is not None else 1
         self.xsd_type = None
 
-    @property
-    def value(self) -> int:
-        return self.obj
-
     @property
     def string_value(self) -> str:
-        return str(self.obj)
+        return str(self.value)
 
     @property
     def iter_typed_values(self) -> Iterator[AtomicType]:
-        yield self.obj
+        yield self.value
 
     @property
     def type_name(self) -> Optional[str]:
@@ -224,12 +220,12 @@ class ModeAttributeNode(IntAttributeNode):
 
     @property
     def string_value(self) -> str:
-        return oct(self.obj)
+        return oct(self.value)
 
 
 class DatetimeAttributeNode(AttributeNode):
     name: str
-    obj: datetime
+    value: datetime
     parent: Optional['PathElementNode']
 
     __slots__ = ()
@@ -240,22 +236,18 @@ class DatetimeAttributeNode(AttributeNode):
                  parent: Optional['PathElementNode'] = None) -> None:
 
         self.name = name
-        self.obj = value
+        self.value = value
         self.parent = parent
         self.position = parent.position if parent is not None else 1
         self.xsd_type = None
 
-    @property
-    def value(self) -> datetime:
-        return self.obj
-
     @property
     def string_value(self) -> str:
-        return str(self.obj)
+        return str(self.value)
 
     @property
     def iter_typed_values(self) -> Iterator[AtomicType]:
-        yield DateTime.fromdatetime(self.obj)
+        yield DateTime.fromdatetime(self.value)
 
     @property
     def type_name(self) -> Optional[str]:

{elementpath-5.0.3 → elementpath-5.0.4}/elementpath/schema_proxy.py

@@ -10,12 +10,11 @@
 from abc import ABCMeta, abstractmethod
 from collections.abc import Iterator
 from functools import lru_cache
-from typing import cast, Any, Optional, Union
+from typing import Any, Optional, Union
 
 from elementpath.exceptions import ElementPathTypeError
 from elementpath.protocols import XsdTypeProtocol, XsdAttributeProtocol, \
-    XsdElementProtocol, XsdSchemaProtocol, XsdAttributeGroupProtocol
-from elementpath.namespaces import XSD_ANY_ATOMIC_TYPE
+    XsdElementProtocol, XsdSchemaProtocol
 from elementpath.datatypes import AtomicType
 from elementpath.etree import is_etree_element
 from elementpath.xpath_context import XPathSchemaContext
@@ -148,16 +147,14 @@ class AbstractSchemaProxy(metaclass=ABCMeta):
         Get the XSD global attribute from the schema's scope.
 
         :param qname: the fully qualified name of the attribute to retrieve.
-        :returns: an object that represents an XSD type or `None`.
         """
         return self._schema.maps.attributes.get(qname)
 
-    def get_element(self, qname: str) -> Optional[XsdElementProtocol]:
+    def get_element(self, qname: str,) -> Optional[XsdElementProtocol]:
         """
         Get the XSD global element from the schema's scope.
 
-        :param qname: the fully qualified name of the element to retrieve.
-        :returns: an object that represents an XSD type or `None`.
+        :param qname: the fully qualified name of the attribute to retrieve.
         """
         return self._schema.maps.elements.get(qname)
 
@@ -171,63 +168,6 @@ class AbstractSchemaProxy(metaclass=ABCMeta):
         """
         return self._schema.maps.substitution_groups.get(qname)
 
-    def get_attribute_type(self, name: str, parent_type: Optional[XsdTypeProtocol] = None) \
-            -> Optional[XsdTypeProtocol]:
-        """
-        Get the XSD attribute type if the provided name is matching in the scope,
-        otherwise return None.
-
-        :param name: the name of the attribute to retrieve.
-        :param parent_type: an optional XSD type that represents the scope where matching \
-        the attribute name. If not provided, the scope is assumed to be the global scope.
-        """
-        if parent_type is None:
-            try:
-                return self._schema.maps.attributes[name].type
-            except KeyError:
-                return None
-        elif hasattr(parent_type, 'attributes'):
-            attributes = cast(XsdAttributeGroupProtocol, parent_type.attributes)
-            if name in attributes:
-                return attributes[name].type
-            elif None in attributes and attributes[None].is_matching(name):
-                try:
-                    return self._schema.maps.attributes[name].type
-                except KeyError:
-                    return None
-            elif name.startswith('{http://www.w3.org/2001/XMLSchema-instance}'):
-                return self._schema.maps.types.get(XSD_ANY_ATOMIC_TYPE)
-
-        return None
-
-    def get_child_type(self, name: str, parent_type: Optional[XsdTypeProtocol] = None) \
-            -> Optional[XsdTypeProtocol]:
-        """
-        Get the child XSD type if the provided name is matching in the scope,
-        otherwise return None.
-
-        :param name: the name of the child element to match.
-        :param parent_type: an optional XSD type that represents the scope where matching \
-        the child element name. If `None` or not provided the scope is the schema.
-        """
-        if parent_type is None:
-            try:
-                return self._schema.maps.elements[name].type
-            except KeyError:
-                return None
-        elif (content := parent_type.model_group) is not None:
-            for xsd_element in content.iter_elements():
-                if xsd_element.is_matching(name):
-                    if xsd_element.name == name:
-                        return xsd_element.type
-                    else:
-                        # a wildcard or a substitute
-                        try:
-                            return self._schema.maps.elements[name].type
-                        except KeyError:
-                            return None
-        return None
-
     @abstractmethod
     def is_instance(self, obj: Any, type_qname: str) -> bool:
         """

{elementpath-5.0.3 → elementpath-5.0.4}/elementpath/serialization.py

@@ -139,7 +139,7 @@ def get_serialization_params(params: Union[None, ElementNode, XPathMap] = None,
                 kwargs[key] = value
 
     elif isinstance(params, ElementNode):
-        root = cast(Union[EtreeElementProtocol, LxmlElementProtocol], params.obj)
+        root = cast(Union[EtreeElementProtocol, LxmlElementProtocol], params.value)
         if root.tag != SERIALIZATION_PARAMS:
             msg = 'output:serialization-parameters tag expected'
             raise xpath_error('XPTY0004', msg, token)
@@ -293,14 +293,14 @@ def serialize_to_xml(elements: Iterable[Any],
     for item in iter_normalized(elements, item_separator):
         if isinstance(item, ElementNode):
             assert isinstance(item, EtreeElementNode)
-            elem = item.obj
+            elem = item.value
         elif isinstance(item, (AttributeNode, NamespaceNode)):
             raise xpath_error('SENR0001', token=token)
         elif isinstance(item, TextNode):
             if item.parent is not None and item.parent.name in cdata_section:
-                chunks.append(f'<![CDATA[{item.obj}]]>')
+                chunks.append(f'<![CDATA[{item.value}]]>')
             else:
-                chunks.append(item.obj)
+                chunks.append(item.value)
             continue
         elif not isinstance(item, str):
             raise xpath_error('SENR0001', token=token)
@@ -352,7 +352,7 @@ def serialize_to_json(elements: Iterable[Any],
                     return ''.join(self.default(child) for child in obj)
                 elif isinstance(obj, ElementNode):
                     assert isinstance(obj, EtreeElementNode)
-                    elem = obj.obj
+                    elem = obj.value
                     assert etree_module is not None
 
                     try:
@@ -368,7 +368,7 @@ def serialize_to_json(elements: Iterable[Any],
                 elif isinstance(obj, (AttributeNode, NamespaceNode)):
                     return f'{obj.name}="{obj.string_value}"'
                 elif isinstance(obj, TextNode):
-                    return obj.obj
+                    return obj.value
                 elif isinstance(obj, CommentNode):
                     return f'<!--{obj.string_value}-->'
                 else:

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

@@ -56,7 +56,7 @@ def get_node_tree(root: RootArgType,
                 return root.getroot()
         elif fragment is False and \
                 isinstance(root, ElementNode) and \
-                is_etree_element_instance(root.obj):
+                is_etree_element_instance(root.value):
             return root.get_document_node()
 
         return root

{elementpath-5.0.3 → elementpath-5.0.4}/elementpath/xpath1/_xpath1_functions.py

@@ -146,7 +146,7 @@ def select_id_function(self: XPathFunction, context: ContextType = None) \
 
     if isinstance(item, (ElementNode, DocumentNode)):
         for element in item.iter_descendants():
-            if isinstance(element, EtreeElementNode) and element.obj.get(XML_ID) == value:
+            if isinstance(element, EtreeElementNode) and element.value.get(XML_ID) == value:
                 yield element
 
 
@@ -380,11 +380,11 @@ def evaluate_lang_function(self: XPathFunction, context: ContextType = None) ->
         return False
     else:
         try:
-            attr = context.item.obj.attrib[XML_LANG]
+            attr = context.item.value.attrib[XML_LANG]
         except KeyError:
             for e in context.iter_ancestors():
-                if isinstance(e, EtreeElementNode) and XML_LANG in e.obj.attrib:
-                    lang = e.obj.attrib[XML_LANG]
+                if isinstance(e, EtreeElementNode) and XML_LANG in e.value.attrib:
+                    lang = e.value.attrib[XML_LANG]
                     if not isinstance(lang, str):
                         return False
                     break

{elementpath-5.0.3 → elementpath-5.0.4}/elementpath/xpath1/_xpath1_operators.py

@@ -673,7 +673,7 @@ def select_child_path(self: XPathToken, context: ContextType = None) \
                 elif result in items:
                     pass
                 elif isinstance(result, ElementNode):
-                    if result.obj not in items:
+                    if result.value not in items:
                         items.add(result)
                         yield result
                 else:
@@ -700,7 +700,7 @@ def select_descendant_path(self: XPathToken, context: ContextType = None) \
                     elif result in items:
                         pass
                     elif isinstance(result, ElementNode):
-                        if result.obj not in items:
+                        if result.value not in items:
                             items.add(result)
                             yield result
                     else:
@@ -723,7 +723,7 @@ def select_descendant_path(self: XPathToken, context: ContextType = None) \
                 elif result in items:
                     pass
                 elif isinstance(result, ElementNode):
-                    if result.obj not in items:
+                    if result.value not in items:
                         items.add(result)
                 else:
                     items.add(result)

{elementpath-5.0.3 → elementpath-5.0.4}/elementpath/xpath2/_xpath2_functions.py

@@ -155,7 +155,7 @@ def evaluate_namespace_uri_for_prefix_function(
     if not isinstance(elem, EtreeElementNode):
         return []
 
-    ns_uris = {get_namespace(e.tag) for e in elem.obj.iter() if not callable(e.tag)}
+    ns_uris = {get_namespace(e.tag) for e in elem.value.iter() if not callable(e.tag)}
     for p, uri in self.parser.namespaces.items():
         if uri in ns_uris:
             if p == prefix:
@@ -180,7 +180,7 @@ def select_in_scope_prefixes_function(self: XPathFunction, context: ContextType
     if not isinstance(arg, ElementNode):
         raise self.error('XPTY0004', 'argument %r is not an element node' % arg)
 
-    elem = arg.obj
+    elem = arg.value
     if isinstance(context, XPathSchemaContext):
         # For schema context returns prefixes of static namespaces
         for pfx, uri in self.parser.namespaces.items():
@@ -1485,15 +1485,15 @@ def evaluate_lang_function(self: XPathFunction, context: ContextType = None) ->
         raise self.error('XPTY0004')
     elif isinstance(item, EtreeElementNode):
         try:
-            attr = item.obj.attrib[XML_LANG]
+            attr = item.value.attrib[XML_LANG]
         except KeyError:
             if len(self) > 1 or context is None:
                 return False
 
             for elem in context.iter_ancestors():
                 if isinstance(elem, EtreeElementNode):
-                    if XML_LANG in elem.obj.attrib:
-                        lang = cast(str, elem.obj.attrib[XML_LANG])
+                    if XML_LANG in elem.value.attrib:
+                        lang = cast(str, elem.value.attrib[XML_LANG])
                         break
             else:
                 return False
@@ -1551,8 +1551,8 @@ def select_id_function(self: XPathFunction, context: ContextType = None) -> Iter
         if not isinstance(element, EtreeElementNode):
             continue
 
-        if element.obj.text in idrefs and element.is_id:
-            idrefs.remove(element.obj.text)
+        if element.value.text in idrefs and element.is_id:
+            idrefs.remove(element.value.text)
             if self.symbol == 'id':
                 yield element
             else:
@@ -1561,11 +1561,11 @@ def select_id_function(self: XPathFunction, context: ContextType = None) -> Iter
                     yield parent
         else:
             for attr in element.attributes:
-                if not isinstance(attr.obj, str):
+                if not isinstance(attr.value, str):
                     continue
 
-                if attr.obj in idrefs and attr.is_id:
-                    idrefs.remove(attr.obj)
+                if attr.value in idrefs and attr.is_id:
+                    idrefs.remove(attr.value)
                     yield element
 
 
@@ -1588,7 +1588,7 @@ def select_idref_function(self: XPathFunction, context: ContextType = None) \
             if not isinstance(element, EtreeElementNode):
                 continue
 
-            text = element.obj.text
+            text = element.value.text
             if text and is_idrefs(text) and \
                     any(v in text.split() for x in ids for v in x.split()):
                 yield element
@@ -1596,8 +1596,8 @@ def select_idref_function(self: XPathFunction, context: ContextType = None) \
 
             if element.attributes:
                 for attr in element.attributes:  # pragma: no cover
-                    if attr.name != XML_ID and isinstance(attr.obj, str) and \
-                            any(v in attr.obj.split() for x in ids for v in x.split()):
+                    if attr.name != XML_ID and isinstance(attr.value, str) and \
+                            any(v in attr.value.split() for x in ids for v in x.split()):
                         yield element
                         break
 

{elementpath-5.0.3 → elementpath-5.0.4}/elementpath/xpath30/_xpath30_functions.py

@@ -1107,7 +1107,7 @@ def evaluate_has_children_function(self: XPathFunction, context: ContextType = N
             raise self.error('XPTY0004', 'argument must be a node')
 
     return isinstance(item, DocumentNode) or \
-        isinstance(item, EtreeElementNode) and (len(item.obj) > 0 or item.obj.text is not None)
+        isinstance(item, EtreeElementNode) and (len(item.value) > 0 or item.value.text is not None)
 
 
 @method(function('innermost', nargs=1, sequence_types=('node()*', 'node()*')))

{elementpath-5.0.3 → elementpath-5.0.4}/elementpath/xpath31/_xpath31_functions.py

@@ -1241,10 +1241,10 @@ def evaluate_xml_to_json_function(self: XPathFunction, context: ContextType = No
         return ','.join(chunks)
 
     if isinstance(input_node, DocumentNode):
-        return elem_to_json(child.obj for child in input_node
+        return elem_to_json(child.value for child in input_node
                             if isinstance(child, EtreeElementNode))
     elif isinstance(input_node, EtreeElementNode):
-        return elem_to_json((input_node.obj,))
+        return elem_to_json((input_node.value,))
     else:
         raise self.error('FOJS0006')
 

{elementpath-5.0.3 → elementpath-5.0.4}/elementpath/xpath_context.py

@@ -154,7 +154,7 @@ class XPathContext:
             self.document = self.root
         elif fragment is None and \
                 isinstance(self.root, ElementNode) and \
-                is_etree_element_instance(self.root.obj):
+                is_etree_element_instance(self.root.value):
             # Creates a dummy document that will be not included in results
             self.document = self.root.get_document_node(as_parent=False)
         else:
@@ -201,9 +201,9 @@ class XPathContext:
 
     def __repr__(self) -> str:
         if self.root is not None:
-            return f'{self.__class__.__name__}(root={self.root.obj})'
+            return f'{self.__class__.__name__}(root={self.root.value})'
         elif isinstance(self.item, XPathNode):
-            return f'{self.__class__.__name__}(item={self.item.obj})'
+            return f'{self.__class__.__name__}(item={self.item.value})'
         else:
             return f'{self.__class__.__name__}(item={self.item!r})'
 
@@ -223,10 +223,10 @@ class XPathContext:
     @cached_property
     def etree(self) -> ModuleType:
         if isinstance(self.root, (DocumentNode, ElementNode)):
-            module_name = self.root.obj.__class__.__module__
+            module_name = self.root.value.__class__.__module__
         elif isinstance(self.item, (DocumentNode, ElementNode, CommentNode,
                                     ProcessingInstructionNode)):
-            module_name = self.item.obj.__class__.__module__
+            module_name = self.item.value.__class__.__module__
         else:
             module_name = 'xml.etree.ElementTree'
 
@@ -300,12 +300,12 @@ class XPathContext:
         if isinstance(item, (XPathNode, AnyAtomicType)):
             return item
         elif is_etree_document(item):
-            if self.root is not None and item is self.root.obj:
+            if self.root is not None and item is self.root.value:
                 return self.root
 
             if self.documents:
                 for doc in self.documents.values():
-                    if doc is not None and item is doc.obj:
+                    if doc is not None and item is doc.value:
                         return doc
 
         elif is_etree_element(item):