diff --git a/AUTHORS.rst b/AUTHORS.rst index 00d91f286..0d8f28aa6 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -140,3 +140,4 @@ Contributors (chronological) - `@phrfpeixoto `_ - `@jceresini `_ - Nikolay Shebanov `@killthekitten `_ +- Laurent Mignon `@lmignon `_ \ No newline at end of file diff --git a/src/marshmallow/fields.py b/src/marshmallow/fields.py index 003c33ae8..1e7651c43 100644 --- a/src/marshmallow/fields.py +++ b/src/marshmallow/fields.py @@ -567,11 +567,12 @@ def _test_collection(self, value, many=False): if many and not utils.is_collection(value): raise self.make_error("type", input=value, type=value.__class__.__name__) - def _load(self, value, data, partial=None, many=False): + def _load(self, value, data, partial=None, many=False, unknown=None): many = self.schema.many or self.many or many + unknown = unknown or self.unknown try: valid_data = self.schema.load( - value, unknown=self.unknown, partial=partial, many=many + value, unknown=unknown, partial=partial, many=many ) except ValidationError as error: raise ValidationError( @@ -579,17 +580,23 @@ def _load(self, value, data, partial=None, many=False): ) from error return valid_data - def _deserialize(self, value, attr, data, partial=None, many=False, **kwargs): + def _deserialize( + self, value, attr, data, partial=None, many=False, unknown=None, **kwargs + ): """Same as :meth:`Field._deserialize` with additional ``partial`` argument. :param bool|tuple partial: For nested schemas, the ``partial`` parameter passed to `Schema.load`. + :param unknown: For nested schemas, the ``unknown`` + parameter passed to `Schema.load`.. .. versionchanged:: 3.0.0 Add ``partial`` parameter. + .. versionchanged:: 3.2.2 + Add ``unknown`` parameter. """ self._test_collection(value, many=many) - return self._load(value, data, partial=partial, many=many) + return self._load(value, data, partial=partial, many=many, unknown=unknown) class Pluck(Nested): diff --git a/src/marshmallow/schema.py b/src/marshmallow/schema.py index 7265514fe..634933742 100644 --- a/src/marshmallow/schema.py +++ b/src/marshmallow/schema.py @@ -652,6 +652,7 @@ def _deserialize( d_kwargs["partial"] = sub_partial else: d_kwargs["partial"] = partial + d_kwargs["unknown"] = unknown getter = lambda val: field_obj.deserialize( val, field_name, data, **d_kwargs ) @@ -665,6 +666,7 @@ def _deserialize( if value is not missing: key = field_obj.attribute or attr_name set_value(typing.cast(typing.Dict, ret), key, value) + unknown = unknown or self.unknown if unknown != EXCLUDE: fields = { field_obj.data_key if field_obj.data_key is not None else field_name @@ -823,7 +825,6 @@ def _do_load( error_store = ErrorStore() errors = {} # type: typing.Dict[str, typing.List[str]] many = self.many if many is None else bool(many) - unknown = unknown or self.unknown if partial is None: partial = self.partial # Run preprocessors diff --git a/tests/test_schema.py b/tests/test_schema.py index 2be35b775..ec167fc5a 100644 --- a/tests/test_schema.py +++ b/tests/test_schema.py @@ -289,6 +289,23 @@ class Outer(Schema): assert Outer().load({"list1": val, "list2": val}) == {"list1": [], "list2": []} +@pytest.mark.parametrize( + "val", + ( + {"inner": {"name": "name"}, "unknown": 1}, + {"inner": {"name": "name", "unknown_nested": 1}, "unknown": 1}, + ), +) +def test_load_unknown(val): + class Inner(Schema): + name = fields.String() + + class Outer(Schema): + inner = fields.Nested(Inner) + + assert Outer().load(val, unknown=EXCLUDE) == {"inner": {"name": "name"}} + + def test_loads_returns_a_user(): s = UserSchema() result = s.loads(json.dumps({"name": "Monty"}))