Respect ECMA regex syntax for schemas.

Merge remote-tracking branch 'Zac-HD/js-regex'

* Zac-HD/js-regex:
  Validate `format: regex` with js-regex
  Squashed 'json/' changes from 2d554504..433ab2f0
  Minor style.
  Use the corresponding tests.
  Use JS regex syntax

Author: Julian

jsonschema/_format.py

@@ -3,6 +3,8 @@
 import socket
 import struct
 
+import js_regex
+
 from jsonschema.compat import str_types
 from jsonschema.exceptions import FormatError
 
@@ -297,11 +299,11 @@ def is_time(instance):
         return is_datetime("1970-01-01T" + instance)
 
 
-@_checks_drafts(name="regex", raises=re.error)
+@_checks_drafts(name="regex", raises=(re.error, js_regex.NotJavascriptRegex))
 def is_regex(instance):
     if not isinstance(instance, str_types):
         return True
-    return re.compile(instance)
+    return js_regex.compile(instance)
 
 
 @_checks_drafts(draft3="date", draft7="date", raises=ValueError)

jsonschema/_utils.py

@@ -1,7 +1,8 @@
 import itertools
 import json
 import pkgutil
-import re
+
+import js_regex
 
 from jsonschema.compat import MutableMapping, str_types, urlsplit
 
@@ -92,10 +93,10 @@ def find_additional_properties(instance, schema):
     """
 
     properties = schema.get("properties", {})
-    patterns = "|".join(schema.get("patternProperties", {}))
+    patterns = "|".join(sorted(schema.get("patternProperties", {})))
     for property in instance:
         if property not in properties:
-            if patterns and re.search(patterns, property):
+            if patterns and js_regex.compile(patterns).search(property):
                 continue
             yield property
 

jsonschema/_validators.py

@@ -1,4 +1,4 @@
-import re
+import js_regex
 
 from jsonschema._utils import (
     ensure_list,
@@ -19,7 +19,7 @@ def patternProperties(validator, patternProperties, instance, schema):
 
     for pattern, subschema in iteritems(patternProperties):
         for k, v in iteritems(instance):
-            if re.search(pattern, k):
+            if js_regex.compile(pattern).search(k):
                 for error in validator.descend(
                     v, subschema, path=k, schema_path=pattern,
                 ):
@@ -197,7 +197,7 @@ def uniqueItems(validator, uI, instance, schema):
 def pattern(validator, patrn, instance, schema):
     if (
         validator.is_type(instance, "string") and
-        not re.search(patrn, instance)
+        not js_regex.compile(patrn).search(instance)
     ):
         yield ValidationError("%r does not match %r" % (instance, patrn))
 

jsonschema/tests/test_jsonschema_test_suite.py

@@ -68,8 +68,8 @@ def narrow_unicode_build(test):  # pragma: no cover
 
 TestDraft3 = DRAFT3.to_unittest_testcase(
     DRAFT3.tests(),
-    DRAFT3.optional_tests_of(name="format"),
     DRAFT3.optional_tests_of(name="bignum"),
+    DRAFT3.optional_tests_of(name="format"),
     DRAFT3.optional_tests_of(name="zeroTerminatedFloats"),
     Validator=Draft3Validator,
     format_checker=draft3_format_checker,
@@ -87,8 +87,9 @@ def narrow_unicode_build(test):  # pragma: no cover
 
 TestDraft4 = DRAFT4.to_unittest_testcase(
     DRAFT4.tests(),
-    DRAFT4.optional_tests_of(name="format"),
     DRAFT4.optional_tests_of(name="bignum"),
+    DRAFT4.optional_tests_of(name="ecmascript-regex"),
+    DRAFT4.optional_tests_of(name="format"),
     DRAFT4.optional_tests_of(name="zeroTerminatedFloats"),
     Validator=Draft4Validator,
     format_checker=draft4_format_checker,
@@ -135,8 +136,9 @@ def narrow_unicode_build(test):  # pragma: no cover
 
 TestDraft6 = DRAFT6.to_unittest_testcase(
     DRAFT6.tests(),
-    DRAFT6.optional_tests_of(name="format"),
     DRAFT6.optional_tests_of(name="bignum"),
+    DRAFT6.optional_tests_of(name="ecmascript-regex"),
+    DRAFT6.optional_tests_of(name="format"),
     DRAFT6.optional_tests_of(name="zeroTerminatedFloats"),
     Validator=Draft6Validator,
     format_checker=draft6_format_checker,
@@ -185,8 +187,9 @@ def narrow_unicode_build(test):  # pragma: no cover
     DRAFT7.tests(),
     DRAFT7.format_tests(),
     DRAFT7.optional_tests_of(name="bignum"),
-    DRAFT7.optional_tests_of(name="zeroTerminatedFloats"),
     DRAFT7.optional_tests_of(name="content"),
+    DRAFT7.optional_tests_of(name="ecmascript-regex"),
+    DRAFT7.optional_tests_of(name="zeroTerminatedFloats"),
     Validator=Draft7Validator,
     format_checker=draft7_format_checker,
     skip=lambda test: (

jsonschema/tests/test_validators.py

@@ -849,7 +849,7 @@ def test_recursive(self):
                             "children": {
                                 "type": "object",
                                 "patternProperties": {
-                                    "^.*$": {
+                                    u"^.*$": {
                                         "$ref": "#/definitions/node",
                                     },
                                 },
@@ -951,8 +951,8 @@ def test_patternProperties(self):
         instance = {"bar": 1, "foo": 2}
         schema = {
             "patternProperties": {
-                "bar": {"type": "string"},
-                "foo": {"minimum": 5},
+                u"bar": {"type": "string"},
+                u"foo": {"minimum": 5},
             },
         }
 

setup.cfg

@@ -28,6 +28,7 @@ setup_requires = setuptools_scm
 install_requires =
     attrs>=17.4.0
     importlib_metadata
+    js-regex>=1.0.0
     pyrsistent>=0.14.0
     setuptools
     six>=1.11.0