marshmallow 3.21.3__tar.gz → 3.23.0__tar.gz

{marshmallow-3.21.3 → marshmallow-3.23.0}/CHANGELOG.rst

@@ -1,6 +1,28 @@
 Changelog
 ---------
 
+3.23.0 (2024-10-17)
+*******************
+
+Features:
+
+- Typing: replace "type" with specific metaclass for ``Schema`` and ``Field``.
+
+Other changes:
+
+- Officially support Python 3.13 (:pr:`2319`).
+- Drop support for Python 3.8 (:pr:`2318`).
+
+3.22.0 (2024-08-20)
+*******************
+
+Features:
+
+- Add ``many`` Meta option to ``Schema`` so it expects a collection by default (:issue:`2270`).
+  Thanks :user:`himalczyk` for reporting and :user:`deckar01` for the PR.
+- Refactor hooks (:pr:`2279`).
+  Thanks :user:`deckar01` for the PR.
+
 3.21.3 (2024-06-05)
 *******************
 

{marshmallow-3.21.3 → marshmallow-3.23.0}/PKG-INFO

@@ -1,31 +1,30 @@
 Metadata-Version: 2.1
 Name: marshmallow
-Version: 3.21.3
+Version: 3.23.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.8
+Requires-Python: >=3.9
 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.8
 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
 Requires-Dist: packaging>=17.0
 Requires-Dist: marshmallow[tests] ; extra == "dev"
 Requires-Dist: tox ; extra == "dev"
-Requires-Dist: pre-commit~=3.5 ; extra == "dev"
-Requires-Dist: sphinx==7.3.7 ; extra == "docs"
-Requires-Dist: sphinx-issues==4.1.0 ; extra == "docs"
-Requires-Dist: alabaster==0.7.16 ; extra == "docs"
+Requires-Dist: pre-commit>=3.5,<5.0 ; extra == "dev"
+Requires-Dist: sphinx==8.1.3 ; extra == "docs"
+Requires-Dist: sphinx-issues==5.0.0 ; extra == "docs"
+Requires-Dist: alabaster==1.0.0 ; extra == "docs"
 Requires-Dist: sphinx-version-warning==1.1.2 ; extra == "docs"
-Requires-Dist: autodocsumm==0.2.12 ; extra == "docs"
+Requires-Dist: autodocsumm==0.2.13 ; extra == "docs"
 Requires-Dist: pytest ; extra == "tests"
-Requires-Dist: pytz ; extra == "tests"
 Requires-Dist: simplejson ; extra == "tests"
 Project-URL: Changelog, https://marshmallow.readthedocs.io/en/latest/changelog.html
 Project-URL: Funding, https://opencollective.com/marshmallow
@@ -40,24 +39,39 @@ Provides-Extra: tests
 marshmallow: simplified object serialization
 ********************************************
 
-.. image:: https://badgen.net/pypi/v/marshmallow
+|pypi| |build-status| |pre-commit| |docs|
+
+.. |pypi| image:: https://badgen.net/pypi/v/marshmallow
     :target: https://pypi.org/project/marshmallow/
     :alt: Latest version
 
-.. image:: https://github.com/marshmallow-code/marshmallow/actions/workflows/build-release.yml/badge.svg
+.. |build-status| image:: https://github.com/marshmallow-code/marshmallow/actions/workflows/build-release.yml/badge.svg
     :target: https://github.com/marshmallow-code/marshmallow/actions/workflows/build-release.yml
     :alt: Build status
 
-.. image:: https://results.pre-commit.ci/badge/github/marshmallow-code/marshmallow/dev.svg
+.. |pre-commit| image:: https://results.pre-commit.ci/badge/github/marshmallow-code/marshmallow/dev.svg
    :target: https://results.pre-commit.ci/latest/github/marshmallow-code/marshmallow/dev
    :alt: pre-commit.ci status
 
-.. image:: https://readthedocs.org/projects/marshmallow/badge/
+.. |docs| image:: https://readthedocs.org/projects/marshmallow/badge/
    :target: https://marshmallow.readthedocs.io/
    :alt: Documentation
 
 **marshmallow** is an ORM/ODM/framework-agnostic library for converting complex datatypes, such as objects, to and from native Python datatypes.
 
+Sponsor Message
+===============
+
+Input an OpenAPI spec to generate API docs that look as good as Stripe's. `Request a preview <https://form.typeform.com/to/bShdJw7z>`_ of your docs on Fern.
+
+.. image:: https://github.com/user-attachments/assets/69916225-0d61-4bd7-b3b9-e378557673cb
+    :target: https://form.typeform.com/to/bShdJw7z
+    :align: center
+    :alt: Fern logo
+
+Example
+=======
+
 .. code-block:: python
 
     from datetime import date
@@ -109,7 +123,7 @@ Full documentation is available at https://marshmallow.readthedocs.io/ .
 Requirements
 ============
 
-- Python >= 3.8
+- Python >= 3.9
 
 Ecosystem
 =========
@@ -152,15 +166,16 @@ Thank you to all our backers! [`Become a backer`_]
 Sponsors
 --------
 
-Support this project by becoming a sponsor (or ask your company to support this project by becoming a sponsor).
-Your logo will show up here with a link to your website. [`Become a sponsor`_]
+marshmallow is sponsored by `Route4Me <https://route4me.com>`_.
 
-.. _`Become a sponsor`: https://opencollective.com/marshmallow#sponsor
+.. image:: https://github.com/user-attachments/assets/018c2e23-032e-4a11-98da-8b6dc25b9054
+    :target: https://route4me.com
+    :alt: Routing Planner
 
-.. image:: https://opencollective.com/static/images/become_sponsor.svg
-    :target: https://opencollective.com/marshmallow#sponsor
-    :alt: Become a sponsor
+Support this project by becoming a sponsor (or ask your company to support this project by becoming a sponsor).
+Your logo will be displayed here with a link to your website. [`Become a sponsor`_]
 
+.. _`Become a sponsor`: https://opencollective.com/marshmallow#sponsor
 
 Professional Support
 ====================

{marshmallow-3.21.3 → marshmallow-3.23.0}/README.rst

@@ -2,24 +2,39 @@
 marshmallow: simplified object serialization
 ********************************************
 
-.. image:: https://badgen.net/pypi/v/marshmallow
+|pypi| |build-status| |pre-commit| |docs|
+
+.. |pypi| image:: https://badgen.net/pypi/v/marshmallow
     :target: https://pypi.org/project/marshmallow/
     :alt: Latest version
 
-.. image:: https://github.com/marshmallow-code/marshmallow/actions/workflows/build-release.yml/badge.svg
+.. |build-status| image:: https://github.com/marshmallow-code/marshmallow/actions/workflows/build-release.yml/badge.svg
     :target: https://github.com/marshmallow-code/marshmallow/actions/workflows/build-release.yml
     :alt: Build status
 
-.. image:: https://results.pre-commit.ci/badge/github/marshmallow-code/marshmallow/dev.svg
+.. |pre-commit| image:: https://results.pre-commit.ci/badge/github/marshmallow-code/marshmallow/dev.svg
    :target: https://results.pre-commit.ci/latest/github/marshmallow-code/marshmallow/dev
    :alt: pre-commit.ci status
 
-.. image:: https://readthedocs.org/projects/marshmallow/badge/
+.. |docs| image:: https://readthedocs.org/projects/marshmallow/badge/
    :target: https://marshmallow.readthedocs.io/
    :alt: Documentation
 
 **marshmallow** is an ORM/ODM/framework-agnostic library for converting complex datatypes, such as objects, to and from native Python datatypes.
 
+Sponsor Message
+===============
+
+Input an OpenAPI spec to generate API docs that look as good as Stripe's. `Request a preview <https://form.typeform.com/to/bShdJw7z>`_ of your docs on Fern.
+
+.. image:: https://github.com/user-attachments/assets/69916225-0d61-4bd7-b3b9-e378557673cb
+    :target: https://form.typeform.com/to/bShdJw7z
+    :align: center
+    :alt: Fern logo
+
+Example
+=======
+
 .. code-block:: python
 
     from datetime import date
@@ -71,7 +86,7 @@ Full documentation is available at https://marshmallow.readthedocs.io/ .
 Requirements
 ============
 
-- Python >= 3.8
+- Python >= 3.9
 
 Ecosystem
 =========
@@ -114,15 +129,16 @@ Thank you to all our backers! [`Become a backer`_]
 Sponsors
 --------
 
-Support this project by becoming a sponsor (or ask your company to support this project by becoming a sponsor).
-Your logo will show up here with a link to your website. [`Become a sponsor`_]
+marshmallow is sponsored by `Route4Me <https://route4me.com>`_.
 
-.. _`Become a sponsor`: https://opencollective.com/marshmallow#sponsor
+.. image:: https://github.com/user-attachments/assets/018c2e23-032e-4a11-98da-8b6dc25b9054
+    :target: https://route4me.com
+    :alt: Routing Planner
 
-.. image:: https://opencollective.com/static/images/become_sponsor.svg
-    :target: https://opencollective.com/marshmallow#sponsor
-    :alt: Become a sponsor
+Support this project by becoming a sponsor (or ask your company to support this project by becoming a sponsor).
+Your logo will be displayed here with a link to your website. [`Become a sponsor`_]
 
+.. _`Become a sponsor`: https://opencollective.com/marshmallow#sponsor
 
 Professional Support
 ====================

marshmallow-3.23.0/docs/_static/css/sponsor-message.css

@@ -0,0 +1,15 @@
+/* Override alabaster's admonition styling, which we used for sponsored messages */
+
+div.admonition-sponsor-message p.admonition-title {
+  font-size: 18px;
+  font-style: normal;
+}
+
+p.admonition-title::after  {
+  content: "";
+}
+
+div.admonition-sponsor-message p {
+  font-size: 14px;
+  font-style: italic;
+}

{marshmallow-3.21.3 → marshmallow-3.23.0}/docs/conf.py

@@ -36,7 +36,7 @@ exclude_patterns = ["_build"]
 html_theme_path = [alabaster.get_path()]
 html_theme = "alabaster"
 html_static_path = ["_static"]
-html_css_files = ["css/versionwarning.css"]
+html_css_files = ["css/versionwarning.css", "css/sponsor-message.css"]
 templates_path = ["_templates"]
 html_show_sourcelink = False
 

{marshmallow-3.21.3 → marshmallow-3.23.0}/docs/index.rst

@@ -6,6 +6,15 @@ marshmallow: simplified object serialization
 
 Release v\ |version|. (:doc:`Changelog <changelog>`)
 
+.. admonition:: Sponsor Message
+
+    Input an OpenAPI spec to generate API docs that look as good as Stripe's. `Request a preview <https://form.typeform.com/to/bShdJw7z>`_ of your docs on Fern.
+
+    .. image:: https://github.com/user-attachments/assets/69916225-0d61-4bd7-b3b9-e378557673cb
+        :target: https://form.typeform.com/to/bShdJw7z
+        :align: center
+        :alt: Fern logo
+
 .. include:: about.rst.inc
 
 Upgrading from an older version?
@@ -18,6 +27,19 @@ Why another library?
 
 See :doc:`this document <why>` to learn about what makes marshmallow unique.
 
+Sponsors
+========
+
+marshmallow is sponsored by `Route4Me <https://route4me.com>`_.
+
+.. image:: https://github.com/user-attachments/assets/018c2e23-032e-4a11-98da-8b6dc25b9054
+    :target: https://route4me.com
+    :alt: Routing Planner
+
+Support this project by becoming a sponsor (or ask your company to support this project by becoming a sponsor).
+Your logo will be displayed here with a link to your website. [`Become a sponsor`_]
+
+.. _`Become a sponsor`: https://opencollective.com/marshmallow#sponsor
 
 Guide
 =====

{marshmallow-3.21.3 → marshmallow-3.23.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "marshmallow"
-version = "3.21.3"
+version = "3.23.0"
 description = "A lightweight library for converting complex datatypes to and from native Python datatypes."
 readme = "README.rst"
 license = { file = "LICENSE" }
@@ -15,13 +15,13 @@ classifiers = [
   "Intended Audience :: Developers",
   "License :: OSI Approved :: MIT License",
   "Programming Language :: Python :: 3",
-  "Programming Language :: Python :: 3.8",
   "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",
 ]
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 dependencies = ["packaging>=17.0"]
 
 [project.urls]
@@ -33,14 +33,14 @@ Tidelift = "https://tidelift.com/subscription/pkg/pypi-marshmallow?utm_source=py
 
 [project.optional-dependencies]
 docs = [
-  "sphinx==7.3.7",
-  "sphinx-issues==4.1.0",
-  "alabaster==0.7.16",
+  "sphinx==8.1.3",
+  "sphinx-issues==5.0.0",
+  "alabaster==1.0.0",
   "sphinx-version-warning==1.1.2",
-  "autodocsumm==0.2.12",
+  "autodocsumm==0.2.13",
 ]
-tests = ["pytest", "pytz", "simplejson"]
-dev = ["marshmallow[tests]", "tox", "pre-commit~=3.5"]
+tests = ["pytest", "simplejson"]
+dev = ["marshmallow[tests]", "tox", "pre-commit>=3.5,<5.0"]
 
 [build-system]
 requires = ["flit_core<4"]

{marshmallow-3.21.3 → marshmallow-3.23.0}/src/marshmallow/class_registry.py

@@ -17,7 +17,7 @@ from marshmallow.exceptions import RegistryError
 if typing.TYPE_CHECKING:
     from marshmallow import Schema
 
-    SchemaType = typing.Type[Schema]
+    SchemaType = type[Schema]
 
 # {
 #   <class_name>: <list of class objects>

{marshmallow-3.21.3 → marshmallow-3.23.0}/src/marshmallow/decorators.py

@@ -68,6 +68,7 @@ Example: ::
 from __future__ import annotations
 
 import functools
+from collections import defaultdict
 from typing import Any, Callable, cast
 
 PRE_DUMP = "pre_dump"
@@ -79,7 +80,7 @@ VALIDATES_SCHEMA = "validates_schema"
 
 
 class MarshmallowHook:
-    __marshmallow_hook__: dict[tuple[str, bool] | str, Any] | None = None
+    __marshmallow_hook__: dict[str, list[tuple[bool, Any]]] | None = None
 
 
 def validates(field_name: str) -> Callable[..., Any]:
@@ -117,7 +118,8 @@ def validates_schema(
     """
     return set_hook(
         fn,
-        (VALIDATES_SCHEMA, pass_many),
+        VALIDATES_SCHEMA,
+        many=pass_many,
         pass_original=pass_original,
         skip_on_field_errors=skip_on_field_errors,
     )
@@ -136,7 +138,7 @@ def pre_dump(
     .. versionchanged:: 3.0.0
         ``many`` is always passed as a keyword arguments to the decorated method.
     """
-    return set_hook(fn, (PRE_DUMP, pass_many))
+    return set_hook(fn, PRE_DUMP, many=pass_many)
 
 
 def post_dump(
@@ -157,7 +159,7 @@ def post_dump(
     .. versionchanged:: 3.0.0
         ``many`` is always passed as a keyword arguments to the decorated method.
     """
-    return set_hook(fn, (POST_DUMP, pass_many), pass_original=pass_original)
+    return set_hook(fn, POST_DUMP, many=pass_many, pass_original=pass_original)
 
 
 def pre_load(
@@ -174,7 +176,7 @@ def pre_load(
         ``partial`` and ``many`` are always passed as keyword arguments to
         the decorated method.
     """
-    return set_hook(fn, (PRE_LOAD, pass_many))
+    return set_hook(fn, PRE_LOAD, many=pass_many)
 
 
 def post_load(
@@ -196,11 +198,11 @@ def post_load(
         ``partial`` and ``many`` are always passed as keyword arguments to
         the decorated method.
     """
-    return set_hook(fn, (POST_LOAD, pass_many), pass_original=pass_original)
+    return set_hook(fn, POST_LOAD, many=pass_many, pass_original=pass_original)
 
 
 def set_hook(
-    fn: Callable[..., Any] | None, key: tuple[str, bool] | str, **kwargs: Any
+    fn: Callable[..., Any] | None, tag: str, many: bool = False, **kwargs: Any
 ) -> Callable[..., Any]:
     """Mark decorated function as a hook to be picked up later.
     You should not need to use this method directly.
@@ -214,7 +216,7 @@ def set_hook(
     """
     # Allow using this as either a decorator or a decorator factory.
     if fn is None:
-        return functools.partial(set_hook, key=key, **kwargs)
+        return functools.partial(set_hook, tag=tag, many=many, **kwargs)
 
     # Set a __marshmallow_hook__ attribute instead of wrapping in some class,
     # because I still want this to end up as a normal (unbound) method.
@@ -222,10 +224,10 @@ def set_hook(
     try:
         hook_config = function.__marshmallow_hook__
     except AttributeError:
-        function.__marshmallow_hook__ = hook_config = {}
+        function.__marshmallow_hook__ = hook_config = defaultdict(list)
     # Also save the kwargs for the tagged function on
-    # __marshmallow_hook__, keyed by (<tag>, <pass_many>)
+    # __marshmallow_hook__, keyed by <tag>
     if hook_config is not None:
-        hook_config[key] = kwargs
+        hook_config[tag].append((many, kwargs))
 
     return fn

{marshmallow-3.21.3 → marshmallow-3.23.0}/src/marshmallow/fields.py

@@ -33,6 +33,10 @@ from marshmallow.utils import (
 from marshmallow.validate import And, Length
 from marshmallow.warnings import RemovedInMarshmallow4Warning
 
+if typing.TYPE_CHECKING:
+    from marshmallow.schema import SchemaMeta
+
+
 __all__ = [
     "Field",
     "Raw",
@@ -535,10 +539,10 @@ class Nested(Field):
     def __init__(
         self,
         nested: SchemaABC
-        | type
+        | SchemaMeta
         | str
-        | dict[str, Field | type]
-        | typing.Callable[[], SchemaABC | type | dict[str, Field | type]],
+        | dict[str, Field | type[Field]]
+        | typing.Callable[[], SchemaABC | SchemaMeta | dict[str, Field | type[Field]]],
         *,
         dump_default: typing.Any = missing_,
         default: typing.Any = missing_,
@@ -700,7 +704,7 @@ class Pluck(Nested):
 
     def __init__(
         self,
-        nested: SchemaABC | type | str | typing.Callable[[], SchemaABC],
+        nested: SchemaABC | SchemaMeta | str | typing.Callable[[], SchemaABC],
         field_name: str,
         **kwargs,
     ):
@@ -751,7 +755,7 @@ class List(Field):
     #: Default error messages.
     default_error_messages = {"invalid": "Not a valid list."}
 
-    def __init__(self, cls_or_instance: Field | type, **kwargs):
+    def __init__(self, cls_or_instance: Field | type[Field], **kwargs):
         super().__init__(**kwargs)
         try:
             self.inner = resolve_field_instance(cls_or_instance)
@@ -1236,7 +1240,7 @@ class DateTime(Field):
         "rfc822": utils.rfcformat,
         "timestamp": utils.timestamp,
         "timestamp_ms": utils.timestamp_ms,
-    }  # type: typing.Dict[str, typing.Callable[[typing.Any], str | float]]
+    }  # type: dict[str, typing.Callable[[typing.Any], str | float]]
 
     DESERIALIZATION_FUNCS = {
         "iso": utils.from_iso_datetime,
@@ -1245,7 +1249,7 @@ class DateTime(Field):
         "rfc822": utils.from_rfc,
         "timestamp": utils.from_timestamp,
         "timestamp_ms": utils.from_timestamp_ms,
-    }  # type: typing.Dict[str, typing.Callable[[str], typing.Any]]
+    }  # type: dict[str, typing.Callable[[str], typing.Any]]
 
     DEFAULT_FORMAT = "iso"
 
@@ -1555,8 +1559,8 @@ class Mapping(Field):
 
     def __init__(
         self,
-        keys: Field | type | None = None,
-        values: Field | type | None = None,
+        keys: Field | type[Field] | None = None,
+        values: Field | type[Field] | None = None,
         **kwargs,
     ):
         super().__init__(**kwargs)
@@ -1878,7 +1882,7 @@ class Enum(Field):
         self,
         enum: type[EnumType],
         *,
-        by_value: bool | Field | type = False,
+        by_value: bool | Field | type[Field] = False,
         **kwargs,
     ):
         super().__init__(**kwargs)

{marshmallow-3.21.3 → marshmallow-3.23.0}/src/marshmallow/schema.py

@@ -40,8 +40,6 @@ from marshmallow.utils import (
 )
 from marshmallow.warnings import RemovedInMarshmallow4Warning
 
-_T = typing.TypeVar("_T")
-
 
 def _get_fields(attrs):
     """Get fields from a class
@@ -57,7 +55,7 @@ def _get_fields(attrs):
 
 # This function allows Schemas to inherit from non-Schema classes and ensures
 #   inheritance according to the MRO
-def _get_fields_by_mro(klass):
+def _get_fields_by_mro(klass: SchemaMeta):
     """Collect fields from a class, following its method resolution order. The
     class itself is excluded from the search; only its parents are checked. Get
     fields from ``_declared_fields`` if available, else use ``__dict__``.
@@ -125,10 +123,10 @@ class SchemaMeta(ABCMeta):
     @classmethod
     def get_declared_fields(
         mcs,
-        klass: type,
+        klass: SchemaMeta,
         cls_fields: list,
         inherited_fields: list,
-        dict_cls: type = dict,
+        dict_cls: type[dict] = dict,
     ):
         """Returns a dictionary of field_name => `Field` pairs declared on the class.
         This is exposed mainly so that plugins can add additional fields, e.g. fields
@@ -148,7 +146,7 @@ class SchemaMeta(ABCMeta):
             class_registry.register(name, cls)
         cls._hooks = cls.resolve_hooks()
 
-    def resolve_hooks(cls) -> dict[types.Tag, list[str]]:
+    def resolve_hooks(cls) -> dict[str, list[tuple[str, bool, dict]]]:
         """Add in the decorated processors
 
         By doing this after constructing the class, we let standard inheritance
@@ -156,7 +154,7 @@ class SchemaMeta(ABCMeta):
         """
         mro = inspect.getmro(cls)
 
-        hooks = defaultdict(list)  # type: typing.Dict[types.Tag, typing.List[str]]
+        hooks = defaultdict(list)  # type: dict[str, list[tuple[str, bool, dict]]]
 
         for attr_name in dir(cls):
             # Need to look up the actual descriptor, not whatever might be
@@ -176,14 +174,16 @@ class SchemaMeta(ABCMeta):
                 continue
 
             try:
-                hook_config = attr.__marshmallow_hook__
+                hook_config = attr.__marshmallow_hook__  # type: dict[str, list[tuple[bool, dict]]]
             except AttributeError:
                 pass
             else:
-                for key in hook_config.keys():
+                for tag, config in hook_config.items():
                     # Use name here so we can get the bound method later, in
                     # case the processor was a descriptor or something.
-                    hooks[key].append(attr_name)
+                    hooks[tag].extend(
+                        (attr_name, many, kwargs) for many, kwargs in config
+                    )
 
         return hooks
 
@@ -226,6 +226,7 @@ class SchemaOpts:
         self.dump_only = getattr(meta, "dump_only", ())
         self.unknown = validate_unknown_parameter_value(getattr(meta, "unknown", RAISE))
         self.register = getattr(meta, "register", True)
+        self.many = getattr(meta, "many", False)
 
 
 class Schema(base.SchemaABC, metaclass=SchemaMeta):
@@ -303,14 +304,14 @@ class Schema(base.SchemaABC, metaclass=SchemaMeta):
         dt.date: ma_fields.Date,
         dt.timedelta: ma_fields.TimeDelta,
         decimal.Decimal: ma_fields.Decimal,
-    }  # type: typing.Dict[type, typing.Type[ma_fields.Field]]
+    }  # type: dict[type, typing.Type[ma_fields.Field]]
     #: Overrides for default schema-level error messages
-    error_messages = {}  # type: typing.Dict[str, str]
+    error_messages = {}  # type: dict[str, str]
 
     _default_error_messages = {
         "type": "Invalid input type.",
         "unknown": "Unknown field.",
-    }  # type: typing.Dict[str, str]
+    }  # type: dict[str, str]
 
     OPTIONS_CLASS = SchemaOpts  # type: type
 
@@ -318,8 +319,8 @@ class Schema(base.SchemaABC, metaclass=SchemaMeta):
 
     # These get set by SchemaMeta
     opts = None  # type: SchemaOpts
-    _declared_fields = {}  # type: typing.Dict[str, ma_fields.Field]
-    _hooks = {}  # type: typing.Dict[types.Tag, typing.List[str]]
+    _declared_fields = {}  # type: dict[str, ma_fields.Field]
+    _hooks = {}  # type: dict[str, list[tuple[str, bool, dict]]]
 
     class Meta:
         """Options object for a Schema.
@@ -342,6 +343,7 @@ class Schema(base.SchemaABC, metaclass=SchemaMeta):
             `OrderedDict`.
         - ``exclude``: Tuple or list of fields to exclude in the serialized result.
             Nested fields can be represented with dot delimiters.
+        - ``many``: Whether the data is a collection by default.
         - ``dateformat``: Default format for `Date <fields.Date>` fields.
         - ``datetimeformat``: Default format for `DateTime <fields.DateTime>` fields.
         - ``timeformat``: Default format for `Time <fields.Time>` fields.
@@ -365,7 +367,7 @@ class Schema(base.SchemaABC, metaclass=SchemaMeta):
         *,
         only: types.StrSequenceOrSet | None = None,
         exclude: types.StrSequenceOrSet = (),
-        many: bool = False,
+        many: bool | None = None,
         context: dict | None = None,
         load_only: types.StrSequenceOrSet = (),
         dump_only: types.StrSequenceOrSet = (),
@@ -379,7 +381,7 @@ class Schema(base.SchemaABC, metaclass=SchemaMeta):
             raise StringNotCollectionError('"exclude" should be a list of strings')
         # copy declared fields from metaclass
         self.declared_fields = copy.deepcopy(self._declared_fields)
-        self.many = many
+        self.many = self.opts.many if many is None else many
         self.only = only
         self.exclude: set[typing.Any] | typing.MutableSet[typing.Any] = set(
             self.opts.exclude
@@ -396,9 +398,9 @@ class Schema(base.SchemaABC, metaclass=SchemaMeta):
         self.context = context or {}
         self._normalize_nested_options()
         #: Dictionary mapping field_names -> :class:`Field` objects
-        self.fields = {}  # type: typing.Dict[str, ma_fields.Field]
-        self.load_fields = {}  # type: typing.Dict[str, ma_fields.Field]
-        self.dump_fields = {}  # type: typing.Dict[str, ma_fields.Field]
+        self.fields = {}  # type: dict[str, ma_fields.Field]
+        self.load_fields = {}  # type: dict[str, ma_fields.Field]
+        self.dump_fields = {}  # type: dict[str, ma_fields.Field]
         self._init_fields()
         messages = {}
         messages.update(self._default_error_messages)
@@ -411,16 +413,19 @@ class Schema(base.SchemaABC, metaclass=SchemaMeta):
         return f"<{self.__class__.__name__}(many={self.many})>"
 
     @property
-    def dict_class(self) -> type:
-        return OrderedDict if self.ordered else dict
+    def dict_class(self) -> type[dict]:
+        if self.ordered:
+            return OrderedDict
+        else:
+            return dict
 
     @classmethod
     def from_dict(
         cls,
-        fields: dict[str, ma_fields.Field | type],
+        fields: dict[str, ma_fields.Field | type[ma_fields.Field]],
         *,
         name: str = "GeneratedSchema",
-    ) -> type:
+    ) -> type[Schema]:
         """Generate a `Schema` class given a dictionary of fields.
 
         .. code-block:: python
@@ -497,7 +502,7 @@ class Schema(base.SchemaABC, metaclass=SchemaMeta):
             return error.valid_data or missing
         return value
 
-    def _serialize(self, obj: _T | typing.Iterable[_T], *, many: bool = False):
+    def _serialize(self, obj: typing.Any, *, many: bool = False):
         """Serialize ``obj``.
 
         :param obj: The object(s) to serialize.
@@ -508,10 +513,7 @@ class Schema(base.SchemaABC, metaclass=SchemaMeta):
             Renamed from ``marshal``.
         """
         if many and obj is not None:
-            return [
-                self._serialize(d, many=False)
-                for d in typing.cast(typing.Iterable[_T], obj)
-            ]
+            return [self._serialize(d, many=False) for d in obj]
         ret = self.dict_class()
         for attr_name, field_obj in self.dump_fields.items():
             value = field_obj.serialize(attr_name, obj, accessor=self.get_attribute)
@@ -539,7 +541,7 @@ class Schema(base.SchemaABC, metaclass=SchemaMeta):
             Validation no longer occurs upon serialization.
         """
         many = self.many if many is None else bool(many)
-        if self._has_processors(PRE_DUMP):
+        if self._hooks[PRE_DUMP]:
             processed_obj = self._invoke_dump_processors(
                 PRE_DUMP, obj, many=many, original_data=obj
             )
@@ -548,7 +550,7 @@ class Schema(base.SchemaABC, metaclass=SchemaMeta):
 
         result = self._serialize(processed_obj, many=many)
 
-        if self._has_processors(POST_DUMP):
+        if self._hooks[POST_DUMP]:
             result = self._invoke_dump_processors(
                 POST_DUMP, result, many=many, original_data=obj
             )
@@ -584,7 +586,7 @@ class Schema(base.SchemaABC, metaclass=SchemaMeta):
         partial=None,
         unknown=RAISE,
         index=None,
-    ) -> _T | list[_T]:
+    ) -> typing.Any | list[typing.Any]:
         """Deserialize ``data``.
 
         :param dict data: The data to deserialize.
@@ -598,26 +600,24 @@ class Schema(base.SchemaABC, metaclass=SchemaMeta):
             fields in the data. Use `EXCLUDE`, `INCLUDE` or `RAISE`.
         :param int index: Index of the item being serialized (for storing errors) if
             serializing a collection, otherwise `None`.
-        :return: A dictionary of the deserialized data.
+        :return: The deserialized data as `dict_class` instance or list of `dict_class`
+        instances if `many` is `True`.
         """
         index_errors = self.opts.index_errors
         index = index if index_errors else None
         if many:
             if not is_collection(data):
                 error_store.store_error([self.error_messages["type"]], index=index)
-                ret_l = []  # type: typing.List[_T]
+                ret_l = []
             else:
                 ret_l = [
-                    typing.cast(
-                        _T,
-                        self._deserialize(
-                            typing.cast(typing.Mapping[str, typing.Any], d),
-                            error_store=error_store,
-                            many=False,
-                            partial=partial,
-                            unknown=unknown,
-                            index=idx,
-                        ),
+                    self._deserialize(
+                        typing.cast(dict, d),
+                        error_store=error_store,
+                        many=False,
+                        partial=partial,
+                        unknown=unknown,
+                        index=idx,
                     )
                     for idx, d in enumerate(data)
                 ]
@@ -802,7 +802,7 @@ class Schema(base.SchemaABC, metaclass=SchemaMeta):
         try:
             self._do_load(data, many=many, partial=partial, postprocess=False)
         except ValidationError as exc:
-            return typing.cast(typing.Dict[str, typing.List[str]], exc.messages)
+            return typing.cast(dict[str, list[str]], exc.messages)
         return {}
 
     ##### Private Helpers #####
@@ -846,7 +846,7 @@ class Schema(base.SchemaABC, metaclass=SchemaMeta):
         if partial is None:
             partial = self.partial
         # Run preprocessors
-        if self._has_processors(PRE_LOAD):
+        if self._hooks[PRE_LOAD]:
             try:
                 processed_data = self._invoke_load_processors(
                     PRE_LOAD, data, many=many, original_data=data, partial=partial
@@ -870,7 +870,7 @@ class Schema(base.SchemaABC, metaclass=SchemaMeta):
                 error_store=error_store, data=result, many=many
             )
             # Run schema-level validation
-            if self._has_processors(VALIDATES_SCHEMA):
+            if self._hooks[VALIDATES_SCHEMA]:
                 field_errors = bool(error_store.errors)
                 self._invoke_schema_validators(
                     error_store=error_store,
@@ -892,7 +892,7 @@ class Schema(base.SchemaABC, metaclass=SchemaMeta):
                 )
             errors = error_store.errors
             # Run post processors
-            if not errors and postprocess and self._has_processors(POST_LOAD):
+            if not errors and postprocess and self._hooks[POST_LOAD]:
                 try:
                     result = self._invoke_load_processors(
                         POST_LOAD,
@@ -1055,9 +1055,6 @@ class Schema(base.SchemaABC, metaclass=SchemaMeta):
             raise error
         self.on_bind_field(field_name, field_obj)
 
-    def _has_processors(self, tag) -> bool:
-        return bool(self._hooks[(tag, True)] or self._hooks[(tag, False)])
-
     def _invoke_dump_processors(
         self, tag: str, data, *, many: bool, original_data=None
     ):
@@ -1102,9 +1099,8 @@ class Schema(base.SchemaABC, metaclass=SchemaMeta):
         return data
 
     def _invoke_field_validators(self, *, error_store: ErrorStore, data, many: bool):
-        for attr_name in self._hooks[VALIDATES]:
+        for attr_name, _, validator_kwargs in self._hooks[VALIDATES]:
             validator = getattr(self, attr_name)
-            validator_kwargs = validator.__marshmallow_hook__[VALIDATES]
             field_name = validator_kwargs["field_name"]
 
             try:
@@ -1159,11 +1155,10 @@ class Schema(base.SchemaABC, metaclass=SchemaMeta):
         partial: bool | types.StrSequenceOrSet | None,
         field_errors: bool = False,
     ):
-        for attr_name in self._hooks[(VALIDATES_SCHEMA, pass_many)]:
+        for attr_name, hook_many, validator_kwargs in self._hooks[VALIDATES_SCHEMA]:
+            if hook_many != pass_many:
+                continue
             validator = getattr(self, attr_name)
-            validator_kwargs = validator.__marshmallow_hook__[
-                (VALIDATES_SCHEMA, pass_many)
-            ]
             if field_errors and validator_kwargs["skip_on_field_errors"]:
                 continue
             pass_original = validator_kwargs.get("pass_original", False)
@@ -1201,12 +1196,11 @@ class Schema(base.SchemaABC, metaclass=SchemaMeta):
         original_data=None,
         **kwargs,
     ):
-        key = (tag, pass_many)
-        for attr_name in self._hooks[key]:
+        for attr_name, hook_many, processor_kwargs in self._hooks[tag]:
+            if hook_many != pass_many:
+                continue
             # This will be a bound method.
             processor = getattr(self, attr_name)
-
-            processor_kwargs = processor.__marshmallow_hook__[key]
             pass_original = processor_kwargs.get("pass_original", False)
 
             if many and not pass_many:

{marshmallow-3.21.3 → marshmallow-3.23.0}/src/marshmallow/types.py

@@ -8,5 +8,4 @@
 import typing
 
 StrSequenceOrSet = typing.Union[typing.Sequence[str], typing.AbstractSet[str]]
-Tag = typing.Union[str, typing.Tuple[str, bool]]
 Validator = typing.Callable[[typing.Any], typing.Any]

{marshmallow-3.21.3 → marshmallow-3.23.0}/tests/base.py

@@ -4,14 +4,14 @@ import datetime as dt
 import functools
 import uuid
 from enum import Enum, IntEnum
+from zoneinfo import ZoneInfo
 
-import pytz
 import simplejson
 
 from marshmallow import Schema, fields, missing, post_load, validate
 from marshmallow.exceptions import ValidationError
 
-central = pytz.timezone("America/Chicago")
+central = ZoneInfo("America/Chicago")
 
 
 class GenderEnum(IntEnum):
@@ -104,9 +104,7 @@ class User:
         # A naive datetime
         self.created = dt.datetime(2013, 11, 10, 14, 20, 58)
         # A TZ-aware datetime
-        self.updated = central.localize(
-            dt.datetime(2013, 11, 10, 14, 20, 58), is_dst=False
-        )
+        self.updated = dt.datetime(2013, 11, 10, 14, 20, 58, tzinfo=central)
         self.id = id_
         self.homepage = homepage
         self.email = email

{marshmallow-3.21.3 → marshmallow-3.23.0}/tests/test_deserialization.py

@@ -477,7 +477,7 @@ class TestFieldDeserialization:
             ),
             (
                 "Sun, 10 Nov 2013 01:23:45 -0600",
-                central.localize(dt.datetime(2013, 11, 10, 1, 23, 45), is_dst=False),
+                dt.datetime(2013, 11, 10, 1, 23, 45, tzinfo=central),
                 True,
             ),
         ],
@@ -521,7 +521,7 @@ class TestFieldDeserialization:
             ),
             (
                 "2013-11-10T01:23:45-06:00",
-                central.localize(dt.datetime(2013, 11, 10, 1, 23, 45), is_dst=False),
+                dt.datetime(2013, 11, 10, 1, 23, 45, tzinfo=central),
                 True,
             ),
         ],

{marshmallow-3.21.3 → marshmallow-3.23.0}/tests/test_options.py

@@ -262,3 +262,19 @@ class TestIncludeOption:
         assert "email" in s._declared_fields.keys()
         assert "from" in s._declared_fields.keys()
         assert isinstance(s._declared_fields["from"], fields.Str)
+
+
+class TestManyOption:
+    class ManySchema(Schema):
+        foo = fields.Str()
+
+        class Meta:
+            many = True
+
+    def test_many_by_default(self):
+        test = self.ManySchema()
+        assert test.load([{"foo": "bar"}]) == [{"foo": "bar"}]
+
+    def test_explicit_single(self):
+        test = self.ManySchema(many=False)
+        assert test.load({"foo": "bar"}) == {"foo": "bar"}

{marshmallow-3.21.3 → marshmallow-3.23.0}/tests/test_serialization.py

@@ -565,7 +565,7 @@ class TestFieldSerialization:
                 "Sun, 10 Nov 2013 01:23:45 +0000",
             ),
             (
-                central.localize(dt.datetime(2013, 11, 10, 1, 23, 45), is_dst=False),
+                dt.datetime(2013, 11, 10, 1, 23, 45, tzinfo=central),
                 "Sun, 10 Nov 2013 01:23:45 -0600",
             ),
         ],
@@ -586,7 +586,7 @@ class TestFieldSerialization:
             ),
             (
                 "timestamp",
-                central.localize(dt.datetime(2013, 11, 10, 0, 23, 45), is_dst=False),
+                dt.datetime(2013, 11, 10, 0, 23, 45, tzinfo=central),
                 1384064625,
             ),
             ("timestamp_ms", dt.datetime(2013, 11, 10, 0, 23, 45), 1384043025000),
@@ -597,7 +597,7 @@ class TestFieldSerialization:
             ),
             (
                 "timestamp_ms",
-                central.localize(dt.datetime(2013, 11, 10, 0, 23, 45), is_dst=False),
+                dt.datetime(2013, 11, 10, 0, 23, 45, tzinfo=central),
                 1384064625000,
             ),
         ],
@@ -620,7 +620,7 @@ class TestFieldSerialization:
                 "2013-11-10T01:23:45+00:00",
             ),
             (
-                central.localize(dt.datetime(2013, 11, 10, 1, 23, 45), is_dst=False),
+                dt.datetime(2013, 11, 10, 1, 23, 45, tzinfo=central),
                 "2013-11-10T01:23:45-06:00",
             ),
         ],

{marshmallow-3.21.3 → marshmallow-3.23.0}/tests/test_utils.py

@@ -124,7 +124,7 @@ def test_is_collection():
             "Sun, 10 Nov 2013 01:23:45 +0000",
         ),
         (
-            central.localize(dt.datetime(2013, 11, 10, 1, 23, 45), is_dst=False),
+            dt.datetime(2013, 11, 10, 1, 23, 45, tzinfo=central),
             "Sun, 10 Nov 2013 01:23:45 -0600",
         ),
     ],
@@ -146,7 +146,7 @@ def test_rfc_format(value, expected):
             "2013-11-10T01:23:45+00:00",
         ),
         (
-            central.localize(dt.datetime(2013, 11, 10, 1, 23, 45), is_dst=False),
+            dt.datetime(2013, 11, 10, 1, 23, 45, tzinfo=central),
             "2013-11-10T01:23:45-06:00",
         ),
     ],
@@ -165,7 +165,7 @@ def test_isoformat(value, expected):
         ),
         (
             "Sun, 10 Nov 2013 01:23:45 -0600",
-            central.localize(dt.datetime(2013, 11, 10, 1, 23, 45), is_dst=False),
+            dt.datetime(2013, 11, 10, 1, 23, 45, tzinfo=central),
         ),
     ],
 )
@@ -194,7 +194,7 @@ def test_from_rfc(value, expected):
         ),
         (
             "2013-11-10T01:23:45-06:00",
-            central.localize(dt.datetime(2013, 11, 10, 1, 23, 45), is_dst=False),
+            dt.datetime(2013, 11, 10, 1, 23, 45, tzinfo=central),
         ),
     ],
 )

{marshmallow-3.21.3 → marshmallow-3.23.0}/tox.ini

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