Skip to content

Commit

Permalink
Merge branch '3.x-line' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
sloria committed Jan 11, 2025
2 parents 40e749a + f907ced commit 7a30b6b
Showing 1 changed file with 2 additions and 10 deletions.
12 changes: 2 additions & 10 deletions src/marshmallow/fields.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,7 @@ class _BaseFieldKwargs(typing.TypedDict, total=False):
dump_default: typing.Any
data_key: str | None
attribute: str | None
validate: (
typing.Callable[[typing.Any], typing.Any]
| typing.Iterable[typing.Callable[[typing.Any], typing.Any]]
| None
)
validate: types.Validator | typing.Iterable[types.Validator] | None
required: bool
allow_none: bool | None
load_only: bool
Expand Down Expand Up @@ -191,11 +187,7 @@ def __init__(
dump_default: typing.Any = missing_,
data_key: str | None = None,
attribute: str | None = None,
validate: (
typing.Callable[[typing.Any], typing.Any]
| typing.Iterable[typing.Callable[[typing.Any], typing.Any]]
| None
) = None,
validate: types.Validator | typing.Iterable[types.Validator] | None = None,
required: bool = False,
allow_none: bool | None = None,
load_only: bool = False,
Expand Down

0 comments on commit 7a30b6b

Please sign in to comment.