marshmallow 4.0.0__tar.gz → 4.1.0__tar.gz

{marshmallow-4.0.0 → marshmallow-4.1.0}/CHANGELOG.rst

@@ -1,6 +1,27 @@
 Changelog
 ---------
 
+4.1.0 (2025-11-01)
+++++++++++++++++++
+
+Other changes:
+
+- Add `__len__` implementation to `missing` so that it can be used with
+  `validate.Length <marshmallow.validate.Length>` (:pr:`2861`).
+  Thanks :user:`agentgodzilla` for the PR.
+- Drop support for Python 3.9 (:pr:`2363`).
+- Test against Python 3.14.
+
+
+4.0.1 (2025-08-28)
+++++++++++++++++++
+
+Bug fixes:
+
+- Fix wildcard import of ``from marshmallow import *`` (:pr:`2823`).
+  Thanks :user:`Florian-Laport` for the PR.
+
+
 4.0.0 (2025-04-16)
 ******************
 
@@ -22,16 +43,14 @@ Other changes:
 
 - Typing: `Field <marshmallow.fields.Field>` is now a generic type with a type argument for the internal value type.
 - `marshmallow.fields.UUID` no longer subclasses `marshmallow.fields.String`.
-- *Backwards-incompatible*: Use `datetime.date.fromisoformat`, `datetime.time.fromisoformat`, and `datetime.datetime.fromisoformat` from the standard library to deserialize dates, times and datetimes (:pr:`2078`).
-- `marshmallow.Schema.load` no longer silently fails to call schema validators when a generator is passed (:issue:`1898`). 
+- `marshmallow.Schema.load` no longer silently fails to call schema validators when a generator is passed (:issue:`1898`).
   The typing of `data` is also updated to be more accurate.
   Thanks :user:`ziplokk1` for reporting.
-
+- *Backwards-incompatible*: Use `datetime.date.fromisoformat`, `datetime.time.fromisoformat`, and `datetime.datetime.fromisoformat` from the standard library to deserialize dates, times and datetimes (:pr:`2078`).
 As a consequence of this change:
   - Time with time offsets are now supported.
   - YYYY-MM-DD is now accepted as a datetime and deserialized as naive 00:00 AM.
   - `from_iso_date`, `from_iso_time` and `from_iso_datetime` are removed from `marshmallow.utils`.
-
 - Remove `isoformat`, `to_iso_time` and `to_iso_datetime` from `marshmallow.utils` (:pr:`2766`).
 - Remove `from_rfc`, and `rfcformat` from `marshmallow.utils` (:pr:`2767`).
 - Remove `is_keyed_tuple` from `marshmallow.utils` (:pr:`2768`).
@@ -152,7 +171,7 @@ Features:
 
 Bug fixes:
 
-- Respect ``data_key`` when schema validators raise a `ValidationError <marshmallow.exceptions.ValidationError>` 
+- Respect ``data_key`` when schema validators raise a `ValidationError <marshmallow.exceptions.ValidationError>`
   with a ``field_name`` argument (:issue:`2170`). Thanks :user:`matejsp` for reporting.
 - Correctly handle multiple `@post_load <marshmallow.post_load>` methods where one method appends to
   the data and another passes ``pass_original=True`` (:issue:`1755`).

{marshmallow-4.0.0 → marshmallow-4.1.0}/CONTRIBUTING.rst

@@ -26,8 +26,7 @@ Ways to contribute
 
 - Comment on some of marshmallow's `open issues <https://github.com/marshmallow-code/marshmallow/issues>`_ (especially those `labeled "feedback welcome" <https://github.com/marshmallow-code/marshmallow/issues?q=is%3Aopen+is%3Aissue+label%3A%22feedback+welcome%22>`_). Share a solution or workaround. Make a suggestion for how a feature can be made better. Opinions are welcome!
 - Improve `the docs <https://marshmallow.readthedocs.io>`_.
-  For straightforward edits,
-  click the ReadTheDocs menu button in the bottom-right corner of the page and click "Edit".
+  For straightforward edits, click the edit button in the top-right corner of the page.
   See the :ref:`Documentation <contributing_documentation>` section of this page if you want to build the docs locally.
 - If you think you've found a bug, `open an issue <https://github.com/marshmallow-code/marshmallow/issues>`_.
 - Contribute an :ref:`example usage <contributing_examples>` of marshmallow.

{marshmallow-4.0.0 → marshmallow-4.1.0}/PKG-INFO

@@ -1,20 +1,20 @@
 Metadata-Version: 2.4
 Name: marshmallow
-Version: 4.0.0
+Version: 4.1.0
 Summary: A lightweight library for converting complex datatypes to and from native Python datatypes.
-Author-email: Steven Loria <sloria1@gmail.com>
-Maintainer-email: Steven Loria <sloria1@gmail.com>, Jérôme Lafréchoux <jerome@jolimont.fr>, Jared Deckard <jared@shademaps.com>
-Requires-Python: >=3.9
+Author-email: Steven Loria <oss@stevenloria.com>
+Maintainer-email: Steven Loria <oss@stevenloria.com>, Jérôme Lafréchoux <jerome@jolimont.fr>, Jared Deckard <jared@shademaps.com>
+Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 License-File: LICENSE
 Requires-Dist: backports-datetime-fromisoformat; python_version < '3.11'
 Requires-Dist: typing-extensions; python_version < '3.11'
@@ -22,11 +22,11 @@ Requires-Dist: marshmallow[tests] ; extra == "dev"
 Requires-Dist: tox ; extra == "dev"
 Requires-Dist: pre-commit>=3.5,<5.0 ; extra == "dev"
 Requires-Dist: autodocsumm==0.2.14 ; extra == "docs"
-Requires-Dist: furo==2024.8.6 ; extra == "docs"
+Requires-Dist: furo==2025.9.25 ; extra == "docs"
 Requires-Dist: sphinx-copybutton==0.5.2 ; extra == "docs"
 Requires-Dist: sphinx-issues==5.0.1 ; extra == "docs"
 Requires-Dist: sphinx==8.2.3 ; extra == "docs"
-Requires-Dist: sphinxext-opengraph==0.10.0 ; extra == "docs"
+Requires-Dist: sphinxext-opengraph==0.13.0 ; extra == "docs"
 Requires-Dist: pytest ; extra == "tests"
 Requires-Dist: simplejson ; extra == "tests"
 Project-URL: Changelog, https://marshmallow.readthedocs.io/en/latest/changelog.html

{marshmallow-4.0.0 → marshmallow-4.1.0}/docs/code_of_conduct.rst

@@ -136,10 +136,10 @@ members. This section covers actual concrete steps.
 Contacting maintainers
 ~~~~~~~~~~~~~~~~~~~~~~
 
-As a small and young project, we don't yet have a Code of Conduct
+As a small project, we don't yet have a Code of Conduct
 enforcement team. Hopefully that will be addressed as we grow, but for
-now, any issues should be addressed to `Steven Loria
-<https://github.com/sloria>`__, via `email <mailto:sloria1@gmail.com>`__
+now, any issues should be addressed to `@sloria
+<https://github.com/sloria>`__, via `email <mailto:oss@stevenloria.com>`__
 or any other medium that you feel comfortable with. Using words like
 "marshmallow code of conduct" in your subject will help make sure your
 message is noticed quickly.

{marshmallow-4.0.0 → marshmallow-4.1.0}/docs/conf.py

@@ -37,7 +37,6 @@ html_theme_options = {
     "light_logo": "marshmallow-logo-with-title.png",
     "dark_logo": "marshmallow-logo-with-title-for-dark-theme.png",
     "source_repository": "https://github.com/marshmallow-code/marshmallow",
-    "announcement": 'This is the documentation for the unreleased 4.0 version. The latest v3 docs are <a href="https://marshmallow.readthedocs.io/en/3.x-line/">here</a>.',
     "source_branch": "dev",
     "source_directory": "docs/",
     "sidebar_hide_name": True,
@@ -45,7 +44,7 @@ html_theme_options = {
         # Serif system font stack: https://systemfontstack.com/
         "font-stack": "Iowan Old Style, Apple Garamond, Baskerville, Times New Roman, Droid Serif, Times, Source Serif Pro, serif, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol;",
     },
-    "top_of_page_buttons": ["view"],
+    "top_of_page_buttons": ["view", "edit"],
 }
 pygments_dark_style = "lightbulb"
 html_favicon = "_static/favicon.ico"

{marshmallow-4.0.0 → marshmallow-4.1.0}/pyproject.toml

@@ -1,12 +1,12 @@
 [project]
 name = "marshmallow"
-version = "4.0.0"
+version = "4.1.0"
 description = "A lightweight library for converting complex datatypes to and from native Python datatypes."
 readme = "README.rst"
 license = { file = "LICENSE" }
-authors = [{ name = "Steven Loria", email = "sloria1@gmail.com" }]
+authors = [{ name = "Steven Loria", email = "oss@stevenloria.com" }]
 maintainers = [
-  { name = "Steven Loria", email = "sloria1@gmail.com" },
+  { name = "Steven Loria", email = "oss@stevenloria.com" },
   { name = "Jérôme Lafréchoux", email = "jerome@jolimont.fr" },
   { name = "Jared Deckard", email = "jared@shademaps.com" },
 ]
@@ -15,13 +15,13 @@ classifiers = [
   "Intended Audience :: Developers",
   "License :: OSI Approved :: MIT License",
   "Programming Language :: Python :: 3",
-  "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
   "Programming Language :: Python :: 3.13",
+  "Programming Language :: Python :: 3.14",
 ]
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 dependencies = [
   "backports-datetime-fromisoformat; python_version < '3.11'",
   "typing-extensions; python_version < '3.11'",
@@ -37,11 +37,11 @@ Tidelift = "https://tidelift.com/subscription/pkg/pypi-marshmallow?utm_source=py
 [project.optional-dependencies]
 docs = [
   "autodocsumm==0.2.14",
-  "furo==2024.8.6",
+  "furo==2025.9.25",
   "sphinx-copybutton==0.5.2",
   "sphinx-issues==5.0.1",
   "sphinx==8.2.3",
-  "sphinxext-opengraph==0.10.0",
+  "sphinxext-opengraph==0.13.0",
 ]
 tests = ["pytest", "simplejson"]
 dev = ["marshmallow[tests]", "tox", "pre-commit>=3.5,<5.0"]
@@ -108,6 +108,7 @@ ignore = [
   "PLR0915", # allow lots of statements
   "PT007",   # ignore false positives due to https://github.com/astral-sh/ruff/issues/14743
   "PT011",   # don't require match when using pytest.raises
+  "RUF043",  # allow metacharacters in match patterns
   "S",       # allow asserts
   "SIM117",  # allow nested with statements because it's more readable sometimes
   "SLF001",  # allow private attribute access

{marshmallow-4.0.0 → marshmallow-4.1.0}/src/marshmallow/__init__.py

@@ -23,7 +23,6 @@ __all__ = [
     "missing",
     "post_dump",
     "post_load",
-    "pprint",
     "pre_dump",
     "pre_load",
     "validates",

{marshmallow-4.0.0 → marshmallow-4.1.0}/src/marshmallow/constants.py

@@ -18,5 +18,8 @@ class _Missing:
     def __repr__(self):
         return "<marshmallow.missing>"
 
+    def __len__(self):
+        return 0
+
 
 missing: typing.Final = _Missing()

{marshmallow-4.0.0 → marshmallow-4.1.0}/src/marshmallow/decorators.py

@@ -68,8 +68,8 @@ Example: ::
 from __future__ import annotations
 
 import functools
+import typing
 from collections import defaultdict
-from typing import Any, Callable, cast
 
 PRE_DUMP = "pre_dump"
 POST_DUMP = "post_dump"
@@ -80,10 +80,10 @@ VALIDATES_SCHEMA = "validates_schema"
 
 
 class MarshmallowHook:
-    __marshmallow_hook__: dict[str, list[tuple[bool, Any]]] | None = None
+    __marshmallow_hook__: dict[str, list[tuple[bool, typing.Any]]] | None = None
 
 
-def validates(*field_names: str) -> Callable[..., Any]:
+def validates(*field_names: str) -> typing.Callable[..., typing.Any]:
     """Register a validator method for field(s).
 
     :param field_names: Names of the fields that the method validates.
@@ -95,12 +95,12 @@ def validates(*field_names: str) -> Callable[..., Any]:
 
 
 def validates_schema(
-    fn: Callable[..., Any] | None = None,
+    fn: typing.Callable[..., typing.Any] | None = None,
     *,
     pass_collection: bool = False,
     pass_original: bool = False,
     skip_on_field_errors: bool = True,
-) -> Callable[..., Any]:
+) -> typing.Callable[..., typing.Any]:
     """Register a schema-level validator.
 
     By default it receives a single object at a time, transparently handling the ``many``
@@ -131,10 +131,10 @@ def validates_schema(
 
 
 def pre_dump(
-    fn: Callable[..., Any] | None = None,
+    fn: typing.Callable[..., typing.Any] | None = None,
     *,
     pass_collection: bool = False,
-) -> Callable[..., Any]:
+) -> typing.Callable[..., typing.Any]:
     """Register a method to invoke before serializing an object. The method
     receives the object to be serialized and returns the processed object.
 
@@ -150,11 +150,11 @@ def pre_dump(
 
 
 def post_dump(
-    fn: Callable[..., Any] | None = None,
+    fn: typing.Callable[..., typing.Any] | None = None,
     *,
     pass_collection: bool = False,
     pass_original: bool = False,
-) -> Callable[..., Any]:
+) -> typing.Callable[..., typing.Any]:
     """Register a method to invoke after serializing an object. The method
     receives the serialized object and returns the processed object.
 
@@ -173,10 +173,10 @@ def post_dump(
 
 
 def pre_load(
-    fn: Callable[..., Any] | None = None,
+    fn: typing.Callable[..., typing.Any] | None = None,
     *,
     pass_collection: bool = False,
-) -> Callable[..., Any]:
+) -> typing.Callable[..., typing.Any]:
     """Register a method to invoke before deserializing an object. The method
     receives the data to be deserialized and returns the processed data.
 
@@ -194,11 +194,11 @@ def pre_load(
 
 
 def post_load(
-    fn: Callable[..., Any] | None = None,
+    fn: typing.Callable[..., typing.Any] | None = None,
     *,
     pass_collection: bool = False,
     pass_original: bool = False,
-) -> Callable[..., Any]:
+) -> typing.Callable[..., typing.Any]:
     """Register a method to invoke after deserializing an object. The method
     receives the deserialized data and returns the processed data.
 
@@ -219,12 +219,12 @@ def post_load(
 
 
 def set_hook(
-    fn: Callable[..., Any] | None,
+    fn: typing.Callable[..., typing.Any] | None,
     tag: str,
     *,
     many: bool = False,
-    **kwargs: Any,
-) -> Callable[..., Any]:
+    **kwargs: typing.Any,
+) -> typing.Callable[..., typing.Any]:
     """Mark decorated function as a hook to be picked up later.
     You should not need to use this method directly.
 
@@ -241,7 +241,7 @@ def set_hook(
 
     # Set a __marshmallow_hook__ attribute instead of wrapping in some class,
     # because I still want this to end up as a normal (unbound) method.
-    function = cast("MarshmallowHook", fn)
+    function = typing.cast("MarshmallowHook", fn)
     try:
         hook_config = function.__marshmallow_hook__
     except AttributeError:

{marshmallow-4.0.0 → marshmallow-4.1.0}/src/marshmallow/exceptions.py

@@ -20,7 +20,6 @@ class ValidationError(MarshmallowError):
     :param message: An error message, list of error messages, or dict of
         error messages. If a dict, the keys are subitems and the values are error messages.
     :param field_name: Field name to store the error on.
-        If `None`, the error is stored as schema-level error.
     :param data: Raw input data.
     :param valid_data: Valid (de)serialized data.
     """

{marshmallow-4.0.0 → marshmallow-4.1.0}/src/marshmallow/fields.py

@@ -1,4 +1,4 @@
-# ruff: noqa: F841, SLF001
+# ruff: noqa: SLF001
 from __future__ import annotations
 
 import abc
@@ -530,7 +530,7 @@ class Nested(Field):
             else:
                 nested = typing.cast("Schema", self.nested)
             # defer the import of `marshmallow.schema` to avoid circular imports
-            from marshmallow.schema import Schema
+            from marshmallow.schema import Schema  # noqa: PLC0415
 
             if isinstance(nested, dict):
                 nested = Schema.from_dict(nested)
@@ -558,7 +558,7 @@ class Nested(Field):
                         f"`Schema`, not {nested.__class__}."
                     )
                 else:
-                    schema_class = class_registry.get_class(nested, all=False)
+                    schema_class = class_registry.get_class(nested, all=False)  # type: ignore[unreachable]
                 self._schema = schema_class(
                     many=self.many,
                     only=self.only,
@@ -591,7 +591,9 @@ class Nested(Field):
             raise self.make_error("type", input=value, type=value.__class__.__name__)
 
     def _load(
-        self, value: typing.Any, partial: bool | types.StrSequenceOrSet | None = None
+        self,
+        value: typing.Any,
+        partial: bool | types.StrSequenceOrSet | None = None,  # noqa: FBT001
     ):
         try:
             valid_data = self.schema.load(value, unknown=self.unknown, partial=partial)
@@ -606,7 +608,7 @@ class Nested(Field):
         value: typing.Any,
         attr: str | None,
         data: typing.Mapping[str, typing.Any] | None,
-        partial: bool | types.StrSequenceOrSet | None = None,
+        partial: bool | types.StrSequenceOrSet | None = None,  # noqa: FBT001
         **kwargs,
     ):
         """Same as :meth:`Field._deserialize` with additional ``partial`` argument.
@@ -683,7 +685,7 @@ class Pluck(Nested):
         return self._load(value, partial=partial)
 
 
-class List(Field[list[typing.Optional[_InternalT]]]):
+class List(Field[list[_InternalT | None]]):
     """A list field, composed with another `Field` class or
     instance.
 
@@ -814,7 +816,7 @@ class Tuple(Field[tuple]):
 
         return tuple(
             field._serialize(each, attr, obj, **kwargs)
-            for field, each in zip(self.tuple_fields, value)
+            for field, each in zip(self.tuple_fields, value, strict=True)
         )
 
     def _deserialize(
@@ -832,7 +834,7 @@ class Tuple(Field[tuple]):
         result = []
         errors = {}
 
-        for idx, (field, each) in enumerate(zip(self.tuple_fields, value)):
+        for idx, (field, each) in enumerate(zip(self.tuple_fields, value, strict=True)):
             try:
                 result.append(field.deserialize(each, **kwargs))
             except ValidationError as error:
@@ -1743,7 +1745,7 @@ class Email(String):
         self.validators.insert(0, validator)
 
 
-class IP(Field[typing.Union[ipaddress.IPv4Address, ipaddress.IPv6Address]]):
+class IP(Field[ipaddress.IPv4Address | ipaddress.IPv6Address]):
     """A IP address field.
 
     :param exploded: If `True`, serialize ipv6 address in long form, ie. with groups
@@ -1800,9 +1802,7 @@ class IPv6(IP):
     DESERIALIZATION_CLASS = ipaddress.IPv6Address
 
 
-class IPInterface(
-    Field[typing.Union[ipaddress.IPv4Interface, ipaddress.IPv6Interface]]
-):
+class IPInterface(Field[ipaddress.IPv4Interface | ipaddress.IPv6Interface]):
     """A IPInterface field.
 
     IP interface is the non-strict form of the IPNetwork type where arbitrary host

{marshmallow-4.0.0 → marshmallow-4.1.0}/src/marshmallow/orderedset.py

@@ -23,7 +23,7 @@
 from collections.abc import MutableSet
 
 
-class OrderedSet(MutableSet):
+class OrderedSet(MutableSet):  # noqa: PLW1641
     def __init__(self, iterable=None):
         self.end = end = []
         end += [None, end, end]  # sentinel node for doubly linked list

{marshmallow-4.0.0 → marshmallow-4.1.0}/src/marshmallow/schema.py

@@ -550,7 +550,7 @@ class Schema(metaclass=SchemaMeta):
         :return: Serialized data
 
         .. versionchanged:: 3.0.0b7
-            This method returns the serialized data rather than a ``(data, errors)`` duple.
+            This method returns the serialized data rather than a ``(data, errors)`` tuple.
             A :exc:`ValidationError <marshmallow.exceptions.ValidationError>` is raised
             if ``obj`` is invalid.
         .. versionchanged:: 3.0.0rc9
@@ -582,7 +582,7 @@ class Schema(metaclass=SchemaMeta):
         :return: A ``json`` string
 
         .. versionchanged:: 3.0.0b7
-            This method returns the serialized data rather than a ``(data, errors)`` duple.
+            This method returns the serialized data rather than a ``(data, errors)`` tuple.
             A :exc:`ValidationError <marshmallow.exceptions.ValidationError>` is raised
             if ``obj`` is invalid.
         """
@@ -723,7 +723,7 @@ class Schema(metaclass=SchemaMeta):
         :return: Deserialized data
 
         .. versionchanged:: 3.0.0b7
-            This method returns the deserialized data rather than a ``(data, errors)`` duple.
+            This method returns the deserialized data rather than a ``(data, errors)`` tuple.
             A :exc:`ValidationError <marshmallow.exceptions.ValidationError>` is raised
             if invalid data are passed.
         """
@@ -757,7 +757,7 @@ class Schema(metaclass=SchemaMeta):
         :return: Deserialized data
 
         .. versionchanged:: 3.0.0b7
-            This method returns the deserialized data rather than a ``(data, errors)`` duple.
+            This method returns the deserialized data rather than a ``(data, errors)`` tuple.
             A :exc:`ValidationError <marshmallow.exceptions.ValidationError>` is raised
             if invalid data are passed.
         .. versionchanged:: 4.0.0
@@ -1188,7 +1188,9 @@ class Schema(metaclass=SchemaMeta):
             pass_original = validator_kwargs.get("pass_original", False)
 
             if many and not pass_collection:
-                for idx, (item, orig) in enumerate(zip(data, original_data)):
+                for idx, (item, orig) in enumerate(
+                    zip(data, original_data, strict=True)
+                ):
                     self._run_validator(
                         validator,
                         item,

{marshmallow-4.0.0 → marshmallow-4.1.0}/src/marshmallow/types.py

@@ -7,23 +7,16 @@
 
 from __future__ import annotations
 
-try:
-    from typing import TypeAlias
-except ImportError:  # Remove when dropping Python 3.9
-    from typing_extensions import TypeAlias
-
 import typing
 
 #: A type that can be either a sequence of strings or a set of strings
-StrSequenceOrSet: TypeAlias = typing.Union[
-    typing.Sequence[str], typing.AbstractSet[str]
-]
+StrSequenceOrSet: typing.TypeAlias = typing.Sequence[str] | typing.AbstractSet[str]
 
 #: Type for validator functions
-Validator: TypeAlias = typing.Callable[[typing.Any], typing.Any]
+Validator: typing.TypeAlias = typing.Callable[[typing.Any], typing.Any]
 
 #: A valid option for the ``unknown`` schema option and argument
-UnknownOption: TypeAlias = typing.Literal["exclude", "include", "raise"]
+UnknownOption: typing.TypeAlias = typing.Literal["exclude", "include", "raise"]
 
 
 class SchemaValidator(typing.Protocol):

{marshmallow-4.0.0 → marshmallow-4.1.0}/src/marshmallow/utils.py

@@ -1,6 +1,5 @@
 """Utility methods for marshmallow."""
 
-# ruff: noqa: T201, T203
 from __future__ import annotations
 
 import datetime as dt
@@ -8,31 +7,25 @@ import inspect
 import typing
 from collections.abc import Mapping, Sequence
 
-# Remove when we drop Python 3.9
-try:
-    from typing import TypeGuard
-except ImportError:
-    from typing_extensions import TypeGuard
-
 from marshmallow.constants import missing
 
 
-def is_generator(obj) -> TypeGuard[typing.Generator]:
+def is_generator(obj) -> typing.TypeGuard[typing.Generator]:
     """Return True if ``obj`` is a generator"""
     return inspect.isgeneratorfunction(obj) or inspect.isgenerator(obj)
 
 
-def is_iterable_but_not_string(obj) -> TypeGuard[typing.Iterable]:
+def is_iterable_but_not_string(obj) -> typing.TypeGuard[typing.Iterable]:
     """Return True if ``obj`` is an iterable object that isn't a string."""
     return (hasattr(obj, "__iter__") and not hasattr(obj, "strip")) or is_generator(obj)
 
 
-def is_sequence_but_not_string(obj) -> TypeGuard[Sequence]:
+def is_sequence_but_not_string(obj) -> typing.TypeGuard[Sequence]:
     """Return True if ``obj`` is a sequence that isn't a string."""
     return isinstance(obj, Sequence) and not isinstance(obj, (str, bytes))
 
 
-def is_collection(obj) -> TypeGuard[typing.Iterable]:
+def is_collection(obj) -> typing.TypeGuard[typing.Iterable]:
     """Return True if ``obj`` is a collection type, e.g list, tuple, queryset."""
     return is_iterable_but_not_string(obj) and not isinstance(obj, Mapping)
 

{marshmallow-4.0.0 → marshmallow-4.1.0}/tests/base.py

@@ -161,17 +161,6 @@ class Blog:
         return item.name in [each.name for each in self.collaborators]
 
 
-class DummyModel:
-    def __init__(self, foo):
-        self.foo = foo
-
-    def __eq__(self, other):
-        return self.foo == other.foo
-
-    def __str__(self):
-        return f"bar {self.foo}"
-
-
 ###### Schemas #####
 
 

{marshmallow-4.0.0 → marshmallow-4.1.0}/tests/test_decorators.py

@@ -165,7 +165,7 @@ class TestPassOriginal:
             def post_load(self, data, original, many, **kwargs):
                 if many:
                     ret = []
-                    for item, orig_item in zip(data, original):
+                    for item, orig_item in zip(data, original, strict=True):
                         item["_post_load"] = orig_item["sentinel"]
                         ret.append(item)
                 else:
@@ -177,7 +177,7 @@ class TestPassOriginal:
             def post_dump(self, data, original, many, **kwargs):
                 if many:
                     ret = []
-                    for item, orig_item in zip(data, original):
+                    for item, orig_item in zip(data, original, strict=True):
                         item["_post_dump"] = orig_item["sentinel"]
                         ret.append(item)
                 else:
@@ -234,7 +234,7 @@ def test_decorated_processor_inheritance():
             item["overridden"] = "overridden"
             return item
 
-        deleted = None
+        deleted = None  # type: ignore[assignment]
 
     parent_dumped = ParentSchema().dump({})
     assert parent_dumped == {

{marshmallow-4.0.0 → marshmallow-4.1.0}/tests/test_deserialization.py

@@ -14,6 +14,7 @@ from marshmallow import (
     RAISE,
     Schema,
     fields,
+    missing,
     validate,
 )
 from marshmallow.exceptions import ValidationError
@@ -1005,6 +1006,13 @@ class TestFieldDeserialization:
         field = fields.Function(lambda x: None, deserialize=lambda val: val.upper())
         assert field.deserialize("foo") == "FOO"
 
+    def test_function_field_deserialization_missing_with_length_validator(self):
+        field = fields.Function(
+            deserialize=lambda value: value.get("some-key", missing),
+            validate=validate.Length(min=0),
+        )
+        assert field.deserialize({}) is missing
+
     def test_function_field_passed_deserialize_only_is_load_only(self):
         field = fields.Function(deserialize=lambda val: val.upper())
         assert field.load_only is True
@@ -1306,7 +1314,7 @@ class TestFieldDeserialization:
         field = fields.List(fields.DateTime())
         result = field.deserialize(dstrings)
         assert all(isinstance(each, dt.datetime) for each in result)
-        for actual, expected in zip(result, dtimes):
+        for actual, expected in zip(result, dtimes, strict=True):
             assert_date_equal(actual, expected)
 
     def test_list_field_deserialize_invalid_item(self):
@@ -1347,7 +1355,9 @@ class TestFieldDeserialization:
 
         assert isinstance(result, tuple)
         assert len(result) == 2
-        for val, type_, true_val in zip(result, (dt.datetime, int), (dtime, 42)):
+        for val, type_, true_val in zip(
+            result, (dt.datetime, int), (dtime, 42), strict=True
+        ):
             assert isinstance(val, type_)
             assert val == true_val
 

{marshmallow-4.0.0 → marshmallow-4.1.0}/tests/test_registry.py

@@ -189,7 +189,7 @@ class FooSerializer(Schema):
 
 def test_multiple_classes_with_same_name_raises_error():
     # Import a class with the same name
-    from .foo_serializer import FooSerializer as FooSerializer1  # noqa: F401
+    from .foo_serializer import FooSerializer as FooSerializer1  # noqa: PLC0415, F401
 
     class MySchema(Schema):
         foo = fields.Nested("FooSerializer")
@@ -204,14 +204,14 @@ def test_multiple_classes_with_same_name_raises_error():
 
 def test_multiple_classes_with_all():
     # Import a class with the same name
-    from .foo_serializer import FooSerializer as FooSerializer1  # noqa: F401
+    from .foo_serializer import FooSerializer as FooSerializer1  # noqa: PLC0415, F401
 
     classes = class_registry.get_class("FooSerializer", all=True)
     assert len(classes) == 2
 
 
 def test_can_use_full_module_path_to_class():
-    from .foo_serializer import FooSerializer as FooSerializer1  # noqa: F401
+    from .foo_serializer import FooSerializer as FooSerializer1  # noqa: PLC0415, F401
 
     # Using full paths is ok
 

{marshmallow-4.0.0 → marshmallow-4.1.0}/tests/test_schema.py

@@ -2265,7 +2265,7 @@ class TestGetAttribute:
         ]
         schema = UserDictSchema(many=True)
         results = schema.dump(user_dicts)
-        for result, user_dict in zip(results, user_dicts):
+        for result, user_dict in zip(results, user_dicts, strict=True):
             assert result["name"] == user_dict["_name"]
             assert result["email"] == user_dict["_email"]
         # can't serialize User object

{marshmallow-4.0.0 → marshmallow-4.1.0}/tests/test_serialization.py

@@ -438,7 +438,7 @@ class TestFieldSerialization:
         )
 
     def test_structured_dict_value_serialize(self, user):
-        user.various_data = {"foo": decimal.Decimal("1")}
+        user.various_data = {"foo": decimal.Decimal(1)}
         field = fields.Dict(values=fields.Decimal)
         assert field.serialize("various_data", user) == {"foo": 1}
 
@@ -448,7 +448,7 @@ class TestFieldSerialization:
         assert field.serialize("various_data", user) == {"1": "bar"}
 
     def test_structured_dict_key_value_serialize(self, user):
-        user.various_data = {1: decimal.Decimal("1")}
+        user.various_data = {1: decimal.Decimal(1)}
         field = fields.Dict(keys=fields.Str, values=fields.Decimal)
         assert field.serialize("various_data", user) == {"1": 1}
 

{marshmallow-4.0.0 → marshmallow-4.1.0}/tests/test_utils.py

@@ -124,7 +124,7 @@ def test_from_timestamp_with_negative_value():
 
 def test_from_timestamp_with_overflow_value():
     value = 9223372036854775
-    with pytest.raises(ValueError, match="out of range"):
+    with pytest.raises(ValueError, match=r"out of range|year must be in 1\.\.9999"):
         utils.from_timestamp(value)
 
 

{marshmallow-4.0.0 → marshmallow-4.1.0}/tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = lint,mypy,py{39,310,311,312,313},docs
+envlist = lint,mypy,py{310,311,312,313,314},docs
 
 [testenv]
 extras = tests