marshmallow 4.0.0__py3-none-any.whl → 4.1.0__py3-none-any.whl

marshmallow/__init__.py

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

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/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/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/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/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/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/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/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.dist-info → marshmallow-4.1.0.dist-info}/METADATA

@@ -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.1.0.dist-info/RECORD

@@ -0,0 +1,19 @@
+marshmallow/__init__.py,sha256=9XHBRTrPmbVaU-Z8CWo8nlcf9Z5VvkRD37d1luJuAaM,573
+marshmallow/class_registry.py,sha256=HTC9srCEaRsiy5L_vUKQso7IQfeZeRXxZfz4_2NitoM,3029
+marshmallow/constants.py,sha256=v86zJ9nywyN7euiHQw8hJSkuPyeuflUvv0jZVtfre8M,415
+marshmallow/decorators.py,sha256=maOozW03vQ7k9qZqZ_TvTYR3w--kb0NfkAOy1Q0TnZ0,10165
+marshmallow/error_store.py,sha256=iCPSdw8nJGiS4fjWuIAY1aSI_Hhckcdo3l_g-7pjaMw,2240
+marshmallow/exceptions.py,sha256=1L3ZHwQNelWU5ujIPsON5tZ6WQPk64pBGWNyfwhz608,2273
+marshmallow/fields.py,sha256=DxFiqatexaj9tbs395Pre_Sr2h3BdlF2scSKxcJLV1M,72154
+marshmallow/orderedset.py,sha256=adVCG4HtfYFexqZThiFsiwc_i0g8LNWI_bF6cjMz2r0,2953
+marshmallow/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+marshmallow/schema.py,sha256=tgcgL1wqJTMd6irpGL7x89lDUNP4cPRCNPY1y6-kBeI,49955
+marshmallow/types.py,sha256=X2DVsg8H7fFqco5yK2tZDwoqjxRPFjVurEdT-YogNC8,1161
+marshmallow/utils.py,sha256=YI38vVbIwa9T1kPrnW8sF6HmTbi0MFZYNzINKwtbxew,5334
+marshmallow/validate.py,sha256=X6uhUir-2DqUVzKMkEN6I8LrLPJ1mbL8RECRggByllU,23931
+marshmallow/experimental/__init__.py,sha256=5_iaUmT7_f6QML2LJXmA3xqgk5UBAgCeIazHtC1GVgc,147
+marshmallow/experimental/context.py,sha256=_4KF6sNK6pE0MckyYTGXmU3hJL2tY-TN4oVmE_eDob0,2040
+marshmallow-4.1.0.dist-info/licenses/LICENSE,sha256=kGtdkFHkJhRMsXOtkRZnuOvQWpxYTCwmwTWzKj7RIAE,1064
+marshmallow-4.1.0.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+marshmallow-4.1.0.dist-info/METADATA,sha256=JQA9KW9qwD2NGhc3sAF4VSU3xIfjssg7LJn39lq8we0,7439
+marshmallow-4.1.0.dist-info/RECORD,,

marshmallow-4.0.0.dist-info/RECORD

@@ -1,19 +0,0 @@
-marshmallow/__init__.py,sha256=EEHr24mHh2kH_pszxdnToOfBG6Z2wqeOKbb0iiDGFv4,587
-marshmallow/class_registry.py,sha256=HTC9srCEaRsiy5L_vUKQso7IQfeZeRXxZfz4_2NitoM,3029
-marshmallow/constants.py,sha256=maYmT3pvjQgfummof45SJI_pDqHDFWSu3knVN7su78M,374
-marshmallow/decorators.py,sha256=CwD37uih8cyquwYGv-qKVPUUtKmj4tgas45AKwTdlZk,9987
-marshmallow/error_store.py,sha256=iCPSdw8nJGiS4fjWuIAY1aSI_Hhckcdo3l_g-7pjaMw,2240
-marshmallow/exceptions.py,sha256=CFb7Xb4KNIqsWycl6cUYlrQFGyNBR7zm18HI0BbXs_I,2335
-marshmallow/fields.py,sha256=CIpnQ_MzX6h4_yO81mR0nJg34CjvieGYFQ7MQOycUOM,72081
-marshmallow/orderedset.py,sha256=-Lq83AWIIFs2bxptDwkHtfQ63ebX3WD3R6N3B5rRnVI,2936
-marshmallow/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-marshmallow/schema.py,sha256=fIF1M3JS8wwNxrzchP7HhrtcDEn-KrLrujLqalA84S8,49904
-marshmallow/types.py,sha256=EAMyppcDjDmSd57IWpBRk5RFY6uPoI8CvDr4pLaBXj8,1297
-marshmallow/utils.py,sha256=T05FkN2S3z3Bc1jF6hfnA9jJEaUqULI3p60bGgFL8Fc,5467
-marshmallow/validate.py,sha256=X6uhUir-2DqUVzKMkEN6I8LrLPJ1mbL8RECRggByllU,23931
-marshmallow/experimental/__init__.py,sha256=5_iaUmT7_f6QML2LJXmA3xqgk5UBAgCeIazHtC1GVgc,147
-marshmallow/experimental/context.py,sha256=_4KF6sNK6pE0MckyYTGXmU3hJL2tY-TN4oVmE_eDob0,2040
-marshmallow-4.0.0.dist-info/licenses/LICENSE,sha256=kGtdkFHkJhRMsXOtkRZnuOvQWpxYTCwmwTWzKj7RIAE,1064
-marshmallow-4.0.0.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-marshmallow-4.0.0.dist-info/METADATA,sha256=UsJ51KLqw0tcRrYZfoCL3mi7e1Hd9-TFKfRWYHIWEMQ,7432
-marshmallow-4.0.0.dist-info/RECORD,,