Update to release v2.0.2

  - Fix for QT3 test case 'K2-MatchesFunc-16a': pattern "[0-9-.]*/"
    is considered invalid for XSD 1.0 and valid for XSD 1.1.

elementpath/regex/patterns.py

@@ -17,6 +17,7 @@
 from .character_classes import I_SHORTCUT_REPLACE, C_SHORTCUT_REPLACE, CharacterClass
 
 HYPHENS_PATTERN = re.compile(r'(?<!\\)--')
+INVALID_HYPHEN_PATTERN = re.compile(r'[^\\]-[^\\]-[^\\]')
 DIGITS_PATTERN = re.compile(r'\d+')
 QUANTIFIER_PATTERN = re.compile(r'{\d+(,(\d+)?)?}')
 FORBIDDEN_ESCAPES_NOREF_PATTERN = re.compile(
@@ -73,6 +74,13 @@ def parse_character_class():
                     msg = "invalid character range '--' at position {}: {!r}"
                     raise RegexError(msg.format(pos, pattern))
 
+                if xsd_version == '1.0':
+                    hyphen_match = INVALID_HYPHEN_PATTERN.search(char_class_pattern)
+                    if hyphen_match is not None:
+                        hyphen_pos = char_class_pos + hyphen_match.span()[1] - 2
+                        msg = "unescaped character '-' at position {}: {!r}"
+                        raise RegexError(msg.format(hyphen_pos, pattern))
+
                 char_class = CharacterClass(char_class_pattern, xsd_version)
                 if negative:
                     char_class.complement()

tests/execute_w3c_tests.py

@@ -78,7 +78,6 @@
 
     # IMHO incorrect tests
     'fn-resolve-uri__fn-resolve-uri-9',  # URI scheme names are lowercase
-    'fn-matches__K2-MatchesFunc-16a',    # "[0-9-.]*/" is valid or dozens of W3C XSD tests fail
 ]
 
 

tests/test_regex.py

@@ -910,6 +910,16 @@ def test_invalid_quantifiers(self):
             translate_pattern('*')
         self.assertIn("unexpected quantifier '*'", str(ctx.exception))
 
+    def test_invalid_hyphen(self):
+        with self.assertRaises(RegexError) as ctx:
+            translate_pattern('[a-b-c]')
+        self.assertIn("unescaped character '-' at position 4", str(ctx.exception))
+
+        regex = translate_pattern('[a-b-c]', xsd_version='1.1')
+        self.assertEqual(regex, '[\\-a-c]')
+        self.assertEqual(translate_pattern('[-a-bc]'), regex)
+        self.assertEqual(translate_pattern('[a-bc-]'), regex)
+
     def test_invalid_pattern_groups(self):
         with self.assertRaises(RegexError) as ctx:
             translate_pattern('(?:.*)')