Skip to content

Commit bc5cde0

Browse files
committed
Merge branch '3.x-line' into dev
2 parents f279186 + 7d15bae commit bc5cde0

3 files changed

Lines changed: 10 additions & 4 deletions

File tree

CHANGELOG.rst

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,15 @@ Previously-deprecated APIs have been removed, including:
121121
- ``Field.fail``, which was replaced by ``Field.make_error`` in 3.0.0.
122122
- `json_module` class Meta option (deprecated in 3.0.0b3). Use `render_module` instead.
123123

124+
(unreleased)
125+
************
126+
127+
Other changes:
128+
129+
- Remove default value for the ``data`` param of `Nested._deserialize <marshmallow.fields.Nested._deserialize>` (:issue:`2802`).
130+
Thanks :user:`gbenson` for reporting.
131+
132+
124133
3.26.0 (2025-01-22)
125134
*******************
126135

pyproject.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,7 @@ include = [
6363
exclude = ["docs/_build/"]
6464

6565
[tool.ruff]
66-
src = ["src", "tests", "examples"]
6766
fix = true
68-
show-fixes = true
69-
output-format = "full"
7067

7168
[tool.ruff.format]
7269
docstring-code-format = true

src/marshmallow/fields.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -599,7 +599,7 @@ def _deserialize(
599599
self,
600600
value: typing.Any,
601601
attr: str | None,
602-
data: typing.Mapping[str, typing.Any] | None = None,
602+
data: typing.Mapping[str, typing.Any] | None,
603603
partial: bool | types.StrSequenceOrSet | None = None,
604604
**kwargs,
605605
):

0 commit comments

Comments
 (0)