fix frozen set

Author: mikeedjones

tests/validators/test_frozenset.py

@@ -1,11 +1,12 @@
 import re
 from collections import deque
 from typing import Any
+from pydantic_core import core_schema as cs
+from pydantic_core import CoreConfig
 
 import pytest
 
 from pydantic_core import SchemaValidator, ValidationError
-from pydantic_core import core_schema as cs
 
 from ..conftest import Err, PyAndJson, infinite_generator, plain_repr
 
@@ -26,14 +27,14 @@ def test_frozenset_ints_both(py_and_json: PyAndJson, input_value, expected):
     [([], frozenset()), ([1, '2', b'3'], {1, '2', b'3'}), (frozenset([1, '2', b'3']), {1, '2', b'3'})],
 )
 def test_frozenset_any(input_value, expected):
-    v = SchemaValidator(schema=cs.frozenset_schema())
+    v = SchemaValidator(cs.frozenset_schema())
     output = v.validate_python(input_value)
     assert output == expected
     assert isinstance(output, frozenset)
 
 
 def test_no_copy():
-    v = SchemaValidator(schema=cs.frozenset_schema())
+    v = SchemaValidator(cs.frozenset_schema())
     input_value = frozenset([1, 2, 3])
     output = v.validate_python(input_value)
     assert output == input_value
@@ -85,7 +86,7 @@ def test_frozenset_no_validators_both(py_and_json: PyAndJson, input_value, expec
 )
 @pytest.mark.thread_unsafe  # generators in parameters not compatible with pytest-run-parallel, https://github.com/Quansight-Labs/pytest-run-parallel/issues/14
 def test_frozenset_ints_python(input_value, expected):
-    v = SchemaValidator(schema=cs.frozenset_schema(items_schema=cs.int_schema()))
+    v = SchemaValidator(cs.frozenset_schema(items_schema=cs.int_schema()))
     if isinstance(expected, Err):
         with pytest.raises(ValidationError, match=re.escape(expected.message)):
             v.validate_python(input_value)
@@ -100,14 +101,14 @@ def test_frozenset_ints_python(input_value, expected):
     [(frozenset([1, 2.5, '3']), {1, 2.5, '3'}), ([1, 2.5, '3'], {1, 2.5, '3'}), ([(1, 2), (3, 4)], {(1, 2), (3, 4)})],
 )
 def test_frozenset_no_validators_python(input_value, expected):
-    v = SchemaValidator(schema=cs.frozenset_schema())
+    v = SchemaValidator(cs.frozenset_schema())
     output = v.validate_python(input_value)
     assert output == expected
     assert isinstance(output, frozenset)
 
 
 def test_frozenset_multiple_errors():
-    v = SchemaValidator(schema=cs.frozenset_schema(items_schema=cs.int_schema()))
+    v = SchemaValidator(cs.frozenset_schema(items_schema=cs.int_schema()))
     with pytest.raises(ValidationError) as exc_info:
         v.validate_python(['a', (1, 2), []])
     assert exc_info.value.errors(include_url=False) == [
@@ -169,7 +170,7 @@ def generate_repeats():
 )
 @pytest.mark.thread_unsafe  # generators in parameters not compatible with pytest-run-parallel, https://github.com/Quansight-Labs/pytest-run-parallel/issues/14
 def test_frozenset_kwargs_python(kwargs: dict[str, Any], input_value, expected):
-    v = SchemaValidator(schema=cs.frozenset_schema(**kwargs))
+    v = SchemaValidator(cs.frozenset_schema(**kwargs))
     if isinstance(expected, Err):
         with pytest.raises(ValidationError, match=re.escape(expected.message)):
             v.validate_python(input_value)
@@ -181,7 +182,7 @@ def test_frozenset_kwargs_python(kwargs: dict[str, Any], input_value, expected):
 
 @pytest.mark.parametrize('input_value,expected', [({1, 2, 3}, {1, 2, 3}), ([1, 2, 3], [1, 2, 3])])
 def test_union_frozenset_list(input_value, expected):
-    v = SchemaValidator(schema=cs.union_schema(choices=[cs.frozenset_schema(), cs.list_schema()]))
+    v = SchemaValidator(cs.union_schema(choices=[cs.frozenset_schema(), cs.list_schema()]))
     if isinstance(expected, Err):
         with pytest.raises(ValidationError, match=re.escape(expected.message)):
             v.validate_python(input_value)
@@ -218,14 +219,7 @@ def test_union_frozenset_list(input_value, expected):
     ],
 )
 def test_union_frozenset_int_frozenset_str(input_value, expected):
-    v = SchemaValidator(
-        schema=cs.union_schema(
-            choices=[
-                cs.frozenset_schema(items_schema=cs.int_schema(strict=True)),
-                cs.frozenset_schema(items_schema=cs.str_schema(strict=True)),
-            ]
-        )
-    )
+    v = SchemaValidator(cs.union_schema(choices=[cs.frozenset_schema(items_schema=cs.int_schema(strict=True)), cs.frozenset_schema(items_schema=cs.str_schema(strict=True))]))
     if isinstance(expected, Err):
         with pytest.raises(ValidationError, match=re.escape(expected.message)) as exc_info:
             v.validate_python(input_value)
@@ -244,7 +238,7 @@ def test_frozenset_as_dict_keys(py_and_json: PyAndJson):
 
 
 def test_repr():
-    v = SchemaValidator(schema=cs.frozenset_schema(strict=True, min_length=42))
+    v = SchemaValidator(cs.frozenset_schema(strict=True, min_length=42))
     assert plain_repr(v) == (
         'SchemaValidator('
         'title="frozenset[any]",'
@@ -266,7 +260,7 @@ def gen(error: bool):
             raise RuntimeError('my error')
         yield 3
 
-    v = SchemaValidator(schema=cs.frozenset_schema(items_schema=cs.int_schema()))
+    v = SchemaValidator(cs.frozenset_schema(items_schema=cs.int_schema()))
     r = v.validate_python(gen(False))
     assert r == {1, 2, 3}
     assert isinstance(r, frozenset)
@@ -295,7 +289,7 @@ def gen(error: bool):
     ],
 )
 def test_frozenset_from_dict_items(input_value, items_schema, expected):
-    v = SchemaValidator(schema=cs.frozenset_schema(items_schema=items_schema))
+    v = SchemaValidator(cs.frozenset_schema(items_schema=items_schema))
     output = v.validate_python(input_value)
     assert isinstance(output, frozenset)
     assert output == expected
@@ -337,9 +331,9 @@ def test_frozenset_from_dict_items(input_value, items_schema, expected):
     ],
 )
 def test_frozenset_fail_fast(fail_fast, expected):
-    v = SchemaValidator(schema=cs.frozenset_schema(items_schema=cs.int_schema(), fail_fast=fail_fast))
+    v = SchemaValidator(cs.frozenset_schema(items_schema=cs.int_schema(), fail_fast=fail_fast))
 
     with pytest.raises(ValidationError) as exc_info:
         v.validate_python([1, 'not-num', 'again'])
 
-    assert exc_info.value.errors(include_url=False) == expected
+    assert exc_info.value.errors(include_url=False) == expected