Temporary arg for jsonschema

Zac-HD · Zac-HD · commit ffd6211eb788 · 2021-12-15T12:16:18.000+11:00
diff --git a/hypothesis-python/RELEASE.rst b/hypothesis-python/RELEASE.rst
@@ -0,0 +1,4 @@
+RELEASE_TYPE: patch
+
+This patch adds a temporary hook for a downstream tool,
+which is not part of the public API.
diff --git a/hypothesis-python/src/hypothesis/strategies/_internal/regex.py b/hypothesis-python/src/hypothesis/strategies/_internal/regex.py
@@ -213,7 +213,7 @@ def base_regex_strategy(regex, parsed=None):
     )
 
 
-def regex_strategy(regex, fullmatch):
+def regex_strategy(regex, fullmatch, *, _temp_jsonschema_hack_no_end_newline=False):
     if not hasattr(regex, "pattern"):
         regex = re.compile(regex)
 
@@ -254,6 +254,15 @@ def regex_strategy(regex, fullmatch):
                 )
             else:
                 right_pad = st.one_of(empty, newline)
+
+            # This will be removed when a regex-syntax-translation library exists.
+            # It's a pretty nasty hack, but means that we can match the semantics
+            # of JSONschema's compatible subset of ECMA regex, which is important
+            # for hypothesis-jsonschema and Schemathesis. See e.g.
+            # https://github.com/schemathesis/schemathesis/issues/1241
+            if _temp_jsonschema_hack_no_end_newline:
+                right_pad = empty
+
     if parsed[0][0] == sre.AT:
         if parsed[0][1] == sre.AT_BEGINNING_STRING:
             left_pad = empty
diff --git a/hypothesis-python/tests/cover/test_regex.py b/hypothesis-python/tests/cover/test_regex.py
@@ -25,6 +25,7 @@
     UNICODE_SPACE_CHARS,
     UNICODE_WORD_CATEGORIES,
     base_regex_strategy,
+    regex_strategy,
 )
 
 from tests.common.debug import assert_all_examples, assert_no_examples, find_any
@@ -462,3 +463,12 @@ def test_sets_allow_multichar_output_in_ignorecase_mode():
         st.from_regex(re.compile("[\u0130_]", re.IGNORECASE)),
         lambda s: len(s) > 1,
     )
+
+
+def test_internals_can_disable_newline_from_dollar_for_jsonschema():
+    pattern = "^abc$"
+    find_any(st.from_regex(pattern), lambda s: s == "abc\n")
+    assert_all_examples(
+        regex_strategy(pattern, False, _temp_jsonschema_hack_no_end_newline=True),
+        lambda s: s == "abc",
+    )
