Fix XPath 2.0 comparison operators with XSD 1.1 datatypes

- Restore old code and add a regression test
sissaschool · Jan 30, 2021 · 62584c7 · 62584c7
1 parent bb1455f
commit 62584c7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/elementpath/xpath2/xpath2_parser.py b/elementpath/xpath2/xpath2_parser.py
@@ -910,6 +910,8 @@ def evaluate(self, context=None):
             operands[0] = float(operands[0])
     elif all(isinstance(x, Duration) for x in operands) and self.symbol in ('eq', 'ne'):
         pass
+    elif (issubclass(cls0, cls1) or issubclass(cls1, cls0)) and not issubclass(cls0, Duration):
+        pass
     else:
         msg = "cannot apply {} between {!r} and {!r}".format(self, *operands)
         raise self.error('XPTY0004', msg)

diff --git a/tests/test_xpath2_parser.py b/tests/test_xpath2_parser.py
@@ -428,6 +428,11 @@ def test_comparison_operators(self):
         self.check_value('xs:duration("P31D") ne xs:yearMonthDuration("P1M")', True)
         self.wrong_type('QName("", "ncname") le QName("", "ncname")', 'XPTY0004')
 
+        # From W3C XSD 1.1 tests
+        context = XPathContext(root=self.etree.XML('<root/>'),
+                               variables={'value': Date(9999, 10, 10)})
+        self.check_value('$value lt current-date()', False, context=context)
+
     def test_comparison_in_expression(self):
         context = XPathContext(self.etree.XML('<value>false</value>'))
         self.check_value("(. = 'false') = (. = 'false')", True, context)