remove schema=

Author: mikeedjones

tests/benchmarks/test_micro_benchmarks.py

@@ -497,7 +497,7 @@ class Foo:
         ),
         ['a'],
     )
-    Foo.__pydantic_validator__ = SchemaValidator(schema=schema)
+    Foo.__pydantic_validator__ = SchemaValidator(schema)
     Foo.__pydantic_serializer__ = SchemaSerializer(schema)
 
     s = SchemaSerializer(core_schema.any_schema())

tests/serializers/test_any.py

@@ -187,7 +187,7 @@ class Model:
         [],
     )
     s = SchemaSerializer(schema)
-    v = SchemaValidator(schema=schema)
+    v = SchemaValidator(schema)
 
     m = v.validate_python({'extra': 'extra'})
 

tests/serializers/test_dataclasses.py

@@ -102,7 +102,7 @@ def test_dataclass():
         ),
     )
     # just check validation works as expected
-    v = SchemaValidator(schema=schema)
+    v = SchemaValidator(schema)
     dc = v.validate_python({'foo': 1, 'bar': 'bar-str', 'spam': 'bite', 'frog': 123})
     assert dc == DataClass(foo=1, bar='bar-str', spam=b'bite', frog=123)
     dc.class_var = 2
@@ -426,7 +426,7 @@ def test_advanced_exclude_nested_lists(exclude, expected):
         BasicModel,
         core_schema.model_fields_schema(dict(subs=core_schema.model_field(core_schema.list_schema(sub_model_schema)))),
     )
-    v = SchemaValidator(schema=model_schema)
+    v = SchemaValidator(model_schema)
 
     data = v.validate_python(
         dict(subs=[dict(k=1, subsubs=[dict(i=1, j=1), dict(i=2, j=2)]), dict(k=2, subsubs=[dict(i=3, j=3)])])
@@ -974,7 +974,7 @@ class MyModel:
         ),
         extra_behavior='allow',
     )
-    v = SchemaValidator(schema=schema)
+    v = SchemaValidator(schema)
     m = v.validate_python({'field_a': b'test', 'field_b': 12, 'field_c': 'extra'})
     assert isinstance(m, MyModel)
     assert m.__dict__ == {'field_a': b'test', 'field_b': 12}

tests/serializers/test_model.py

@@ -80,7 +80,7 @@ class Other(Parent):
         ),
         config=core_schema.CoreConfig(extra_fields_behavior='allow'),
     )
-    Parent.__pydantic_validator__ = SchemaValidator(schema=Parent.__pydantic_core_schema__)
+    Parent.__pydantic_validator__ = SchemaValidator(Parent.__pydantic_core_schema__)
     Parent.__pydantic_serializer__ = SchemaSerializer(Parent.__pydantic_core_schema__)
 
     Other.__pydantic_core_schema__ = core_schema.model_schema(
@@ -93,7 +93,7 @@ class Other(Parent):
         ),
         config=core_schema.CoreConfig(extra_fields_behavior='forbid'),
     )
-    Other.__pydantic_validator__ = SchemaValidator(schema=Other.__pydantic_core_schema__)
+    Other.__pydantic_validator__ = SchemaValidator(Other.__pydantic_core_schema__)
     Other.__pydantic_serializer__ = SchemaSerializer(Other.__pydantic_core_schema__)
 
     other = Other.__pydantic_validator__.validate_python({'x': 1, 'y': 'some string'})

tests/serializers/test_other.py

@@ -20,7 +20,7 @@ class Child(Parent):
             }
         ),
     )
-    Parent.__pydantic_validator__ = SchemaValidator(schema=Parent.__pydantic_core_schema__)
+    Parent.__pydantic_validator__ = SchemaValidator(Parent.__pydantic_core_schema__)
     Parent.__pydantic_serializer__ = SchemaSerializer(Parent.__pydantic_core_schema__)
 
     Child.__pydantic_core_schema__ = core_schema.model_schema(
@@ -32,7 +32,7 @@ class Child(Parent):
             }
         ),
     )
-    Child.__pydantic_validator__ = SchemaValidator(schema=Child.__pydantic_core_schema__)
+    Child.__pydantic_validator__ = SchemaValidator(Child.__pydantic_core_schema__)
     Child.__pydantic_serializer__ = SchemaSerializer(Child.__pydantic_core_schema__)
 
     child = Child.__pydantic_validator__.validate_python({'x': 1, 'y': 'hopefully not a secret'})
@@ -61,7 +61,7 @@ class Child(Parent):
         ),
         ['x'],
     )
-    Parent.__pydantic_validator__ = SchemaValidator(schema=Parent.__pydantic_core_schema__)
+    Parent.__pydantic_validator__ = SchemaValidator(Parent.__pydantic_core_schema__)
     Parent.__pydantic_serializer__ = SchemaSerializer(Parent.__pydantic_core_schema__)
 
     Child.__pydantic_core_schema__ = core_schema.dataclass_schema(
@@ -75,7 +75,7 @@ class Child(Parent):
         ),
         ['x', 'y'],
     )
-    Child.__pydantic_validator__ = SchemaValidator(schema=Child.__pydantic_core_schema__)
+    Child.__pydantic_validator__ = SchemaValidator(Child.__pydantic_core_schema__)
     Child.__pydantic_serializer__ = SchemaSerializer(Child.__pydantic_core_schema__)
 
     child = Child.__pydantic_validator__.validate_python({'x': 1, 'y': 'hopefully not a secret'})
@@ -98,7 +98,7 @@ class Child(Parent):
             'x': core_schema.typed_dict_field(core_schema.int_schema()),
         }
     )
-    Parent.__pydantic_validator__ = SchemaValidator(schema=Parent.__pydantic_core_schema__)
+    Parent.__pydantic_validator__ = SchemaValidator(Parent.__pydantic_core_schema__)
     Parent.__pydantic_serializer__ = SchemaSerializer(Parent.__pydantic_core_schema__)
 
     Child.__pydantic_core_schema__ = core_schema.typed_dict_schema(
@@ -107,7 +107,7 @@ class Child(Parent):
             'y': core_schema.typed_dict_field(core_schema.str_schema()),
         }
     )
-    Child.__pydantic_validator__ = SchemaValidator(schema=Child.__pydantic_core_schema__)
+    Child.__pydantic_validator__ = SchemaValidator(Child.__pydantic_core_schema__)
     Child.__pydantic_serializer__ = SchemaSerializer(Child.__pydantic_core_schema__)
 
     child = Child.__pydantic_validator__.validate_python({'x': 1, 'y': 'hopefully not a secret'})
@@ -133,7 +133,7 @@ class Other:
             }
         ),
     )
-    Parent.__pydantic_validator__ = SchemaValidator(schema=Parent.__pydantic_core_schema__)
+    Parent.__pydantic_validator__ = SchemaValidator(Parent.__pydantic_core_schema__)
     Parent.__pydantic_serializer__ = SchemaSerializer(Parent.__pydantic_core_schema__)
 
     Other.__pydantic_core_schema__ = core_schema.model_schema(
@@ -145,7 +145,7 @@ class Other:
         ),
         config=core_schema.CoreConfig(extra_fields_behavior='allow'),
     )
-    Other.__pydantic_validator__ = SchemaValidator(schema=Other.__pydantic_core_schema__)
+    Other.__pydantic_validator__ = SchemaValidator(Other.__pydantic_core_schema__)
     Other.__pydantic_serializer__ = SchemaSerializer(Other.__pydantic_core_schema__)
 
     other = Other.__pydantic_validator__.validate_python({'x': 1, 'y': 'hopefully not a secret'})

tests/serializers/test_serialize_as_any.py

@@ -6,7 +6,7 @@
 
 
 def test_url():
-    v = SchemaValidator(schema=core_schema.url_schema())
+    v = SchemaValidator(core_schema.url_schema())
     s = SchemaSerializer(core_schema.url_schema())
 
     url = v.validate_python('https://example.com')
@@ -26,7 +26,7 @@ def test_url():
 
 
 def test_multi_host_url():
-    v = SchemaValidator(schema=core_schema.multi_host_url_schema())
+    v = SchemaValidator(core_schema.multi_host_url_schema())
     s = SchemaSerializer(core_schema.multi_host_url_schema())
 
     url = v.validate_python('https://example.com,example.org/path')
@@ -46,7 +46,7 @@ def test_multi_host_url():
 
 
 def test_url_dict_keys():
-    v = SchemaValidator(schema=core_schema.url_schema())
+    v = SchemaValidator(core_schema.url_schema())
 
     s = SchemaSerializer(core_schema.dict_schema(core_schema.url_schema()))
     url = v.validate_python('https://example.com')
@@ -56,7 +56,7 @@ def test_url_dict_keys():
 
 
 def test_multi_host_url_dict_keys():
-    v = SchemaValidator(schema=core_schema.multi_host_url_schema())
+    v = SchemaValidator(core_schema.multi_host_url_schema())
 
     s = SchemaSerializer(core_schema.dict_schema(core_schema.multi_host_url_schema()))
     url = v.validate_python('https://example.com,example.org/path')

tests/serializers/test_url.py

@@ -28,7 +28,7 @@ def test_build_error_deep():
 
 
 def test_schema_as_string():
-    v = SchemaValidator(schema=cs.bool_schema())
+    v = SchemaValidator(cs.bool_schema())
     assert v.validate_python('tRuE') is True
 
 
@@ -53,7 +53,7 @@ def test_schema_wrong_type(pydantic_version):
 
 @pytest.mark.parametrize('pickle_protocol', range(1, pickle.HIGHEST_PROTOCOL + 1))
 def test_pickle(pickle_protocol: int) -> None:
-    v1 = SchemaValidator(schema=cs.bool_schema())
+    v1 = SchemaValidator(cs.bool_schema())
     assert v1.validate_python('tRuE') is True
     p = pickle.dumps(v1, protocol=pickle_protocol)
     v2 = pickle.loads(p)
@@ -77,7 +77,7 @@ def test_not_schema_definition_error():
             for i in range(101)
         },
     }
-    v = SchemaValidator(schema=schema)
+    v = SchemaValidator(schema)
     assert repr(v).count('TypedDictField') == 101
 
 
@@ -98,7 +98,7 @@ def test_function_no_mode():
 
 def test_try_self_schema_discriminator():
     """Trying to use self-schema when it shouldn't be used"""
-    v = SchemaValidator(schema=cs.tagged_union_schema(choices={'int': cs.int_schema()}, discriminator='self-schema'))
+    v = SchemaValidator(cs.tagged_union_schema(choices={'int': cs.int_schema()}, discriminator='self-schema'))
     assert 'discriminator: LookupKey' in repr(v)
 
 
@@ -138,4 +138,4 @@ def test_build_recursive_schema_from_defs() -> None:
         ],
     )
 
-    SchemaValidator(schema=s)
+    SchemaValidator(s)

tests/test_build.py

@@ -11,7 +11,7 @@
 
 
 def test_on_field():
-    v = SchemaValidator(schema=cs.str_schema(min_length=2, max_length=5))
+    v = SchemaValidator(cs.str_schema(min_length=2, max_length=5))
     r = plain_repr(v)
     assert 'min_length:Some(2)' in r
     assert 'max_length:Some(5)' in r
@@ -20,14 +20,14 @@ def test_on_field():
 
 
 def test_on_config():
-    v = SchemaValidator(schema=cs.str_schema(), config=CoreConfig(str_max_length=5))
+    v = SchemaValidator(cs.str_schema(), config=CoreConfig(str_max_length=5))
     assert 'max_length:Some(5)' in plain_repr(v)
     assert v.isinstance_python('test') is True
     assert v.isinstance_python('test long') is False
 
 
 def test_field_priority_arg():
-    v = SchemaValidator(schema=cs.str_schema(max_length=5), config=CoreConfig(str_max_length=10))
+    v = SchemaValidator(cs.str_schema(max_length=5), config=CoreConfig(str_max_length=10))
     assert 'max_length:Some(5)' in plain_repr(v)
     assert v.isinstance_python('test') is True
     assert v.isinstance_python('test long') is False
@@ -40,7 +40,7 @@ class MyModel:
 
 def test_on_model_class():
     v = SchemaValidator(
-        schema=cs.model_schema(
+        cs.model_schema(
             cls=MyModel,
             config=CoreConfig(str_max_length=5),
             schema=cs.model_fields_schema(fields={'f': cs.model_field(schema=cs.str_schema())}),
@@ -53,7 +53,7 @@ def test_on_model_class():
 
 def test_field_priority_model():
     v = SchemaValidator(
-        schema=cs.model_schema(
+        cs.model_schema(
             cls=MyModel,
             config=CoreConfig(str_max_length=10),
             schema=cs.model_fields_schema(fields={'f': cs.model_field(schema=cs.str_schema(max_length=5))}),
@@ -103,7 +103,7 @@ def test_field_priority_model():
 )
 def test_allow_inf_nan(config: CoreConfig, float_field_schema, input_value, expected):
     v = SchemaValidator(
-        schema=cs.model_schema(
+        cs.model_schema(
             cls=MyModel,
             schema=cs.model_fields_schema(fields={'x': cs.model_field(schema=float_field_schema)}),
             config=config,
@@ -127,7 +127,7 @@ def test_allow_inf_nan(config: CoreConfig, float_field_schema, input_value, expe
 )
 def test_hide_input_in_errors(config, input_str):
     v = SchemaValidator(
-        schema=cs.model_schema(
+        cs.model_schema(
             cls=MyModel, schema=cs.model_fields_schema(fields={'f': cs.model_field(schema=cs.str_schema())})
         ),
         config=config,
@@ -138,14 +138,14 @@ def test_hide_input_in_errors(config, input_str):
 
 
 def test_cache_strings():
-    v = SchemaValidator(schema=cs.str_schema())
+    v = SchemaValidator(cs.str_schema())
     assert 'cache_strings=True' in plain_repr(v)
 
-    v = SchemaValidator(schema=cs.str_schema(), config=CoreConfig(cache_strings=True))
+    v = SchemaValidator(cs.str_schema(), config=CoreConfig(cache_strings=True))
     assert 'cache_strings=True' in plain_repr(v)
 
-    v = SchemaValidator(schema=cs.str_schema(), config=CoreConfig(cache_strings=False))
+    v = SchemaValidator(cs.str_schema(), config=CoreConfig(cache_strings=False))
     assert 'cache_strings=False' in plain_repr(v)
 
-    v = SchemaValidator(schema=cs.str_schema(), config=CoreConfig(cache_strings='keys'))
+    v = SchemaValidator(cs.str_schema(), config=CoreConfig(cache_strings='keys'))
     assert "cache_strings='keys'" in plain_repr(v)