marshmallow 3.20.2__tar.gz → 3.21.1__tar.gz

{marshmallow-3.20.2 → marshmallow-3.21.1}/CHANGELOG.rst

@@ -1,6 +1,29 @@
 Changelog
 ---------
 
+3.21.1 (2024-03-04)
+*******************
+
+Bug fixes:
+
+- Fix error message when field is declared as a class and not an instance (:issue:`2245`).
+  Thanks :user:`travnick` for reporting.
+
+3.21.0 (2024-02-26)
+*******************
+
+Bug fixes:
+
+- Fix validation of ``URL`` fields to allow missing user field,
+  per NWG RFC 3986 (:issue:`2232`). Thanks :user:`ddennerline3` for reporting
+  and :user:`deckar01` for the PR.
+
+Other changes:
+
+- *Backwards-incompatible*: ``__version__``, ``__parsed_version__``, and ``__version_info__``
+  attributes are deprecated (:issue:`2227`). Use feature detection or
+  ``importlib.metadata.version("marshmallow")`` instead.
+
 3.20.2 (2024-01-09)
 *******************
 

{marshmallow-3.20.2 → marshmallow-3.21.1}/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2024 Steven Loria and contributors
+Copyright Steven Loria and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

{marshmallow-3.20.2/src/marshmallow.egg-info → marshmallow-3.21.1}/PKG-INFO

@@ -1,16 +1,11 @@
 Metadata-Version: 2.1
 Name: marshmallow
-Version: 3.20.2
+Version: 3.21.1
 Summary: A lightweight library for converting complex datatypes to and from native Python datatypes.
-Home-page: https://github.com/marshmallow-code/marshmallow
-Author: Steven Loria
-Author-email: sloria1@gmail.com
-License: MIT
-Project-URL: Changelog, https://marshmallow.readthedocs.io/en/latest/changelog.html
-Project-URL: Issues, https://github.com/marshmallow-code/marshmallow/issues
-Project-URL: Funding, https://opencollective.com/marshmallow
-Project-URL: Tidelift, https://tidelift.com/subscription/pkg/pypi-marshmallow?utm_source=pypi-marshmallow&utm_medium=pypi
-Keywords: serialization,rest,json,api,marshal,marshalling,deserialization,validation,schema
+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
+Description-Content-Type: text/x-rst
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
@@ -20,27 +15,26 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Python: >=3.8
-License-File: LICENSE
 Requires-Dist: packaging>=17.0
-Provides-Extra: tests
-Requires-Dist: pytest; extra == "tests"
-Requires-Dist: pytz; extra == "tests"
-Requires-Dist: simplejson; extra == "tests"
-Provides-Extra: lint
-Requires-Dist: pre-commit<4.0,>=2.4; extra == "lint"
-Provides-Extra: docs
-Requires-Dist: sphinx==7.2.6; extra == "docs"
-Requires-Dist: sphinx-issues==3.0.1; extra == "docs"
-Requires-Dist: alabaster==0.7.15; extra == "docs"
-Requires-Dist: sphinx-version-warning==1.1.2; extra == "docs"
-Requires-Dist: autodocsumm==0.2.12; extra == "docs"
+Requires-Dist: marshmallow[tests] ; extra == "dev"
+Requires-Dist: tox ; extra == "dev"
+Requires-Dist: pre-commit~=3.5 ; extra == "dev"
+Requires-Dist: sphinx==7.2.6 ; extra == "docs"
+Requires-Dist: sphinx-issues==4.0.0 ; extra == "docs"
+Requires-Dist: alabaster==0.7.16 ; extra == "docs"
+Requires-Dist: sphinx-version-warning==1.1.2 ; extra == "docs"
+Requires-Dist: autodocsumm==0.2.12 ; 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
+Project-URL: Issues, https://github.com/marshmallow-code/marshmallow/issues
+Project-URL: Source, https://github.com/marshmallow-code/marshmallow
+Project-URL: Tidelift, https://tidelift.com/subscription/pkg/pypi-marshmallow?utm_source=pypi-marshmallow&utm_medium=pypi
 Provides-Extra: dev
-Requires-Dist: pytest; extra == "dev"
-Requires-Dist: pytz; extra == "dev"
-Requires-Dist: simplejson; extra == "dev"
-Requires-Dist: pre-commit<4.0,>=2.4; extra == "dev"
-Requires-Dist: tox; extra == "dev"
+Provides-Extra: docs
+Provides-Extra: tests
 
 ********************************************
 marshmallow: simplified object serialization
@@ -61,11 +55,6 @@ marshmallow: simplified object serialization
 .. image:: https://readthedocs.org/projects/marshmallow/badge/
    :target: https://marshmallow.readthedocs.io/
    :alt: Documentation
-   
-.. image:: https://badgen.net/badge/code%20style/black/000
-    :target: https://github.com/ambv/black
-    :alt: code style: black
-
 
 **marshmallow** is an ORM/ODM/framework-agnostic library for converting complex datatypes, such as objects, to and from native Python datatypes.
 
@@ -200,7 +189,7 @@ Project Links
 - Docs: https://marshmallow.readthedocs.io/
 - Changelog: https://marshmallow.readthedocs.io/en/latest/changelog.html
 - Contributing Guidelines: https://marshmallow.readthedocs.io/en/latest/contributing.html
-- PyPI: https://pypi.python.org/pypi/marshmallow
+- PyPI: https://pypi.org/project/marshmallow/
 - Issues: https://github.com/marshmallow-code/marshmallow/issues
 - Donate: https://opencollective.com/marshmallow
 
@@ -208,3 +197,4 @@ License
 =======
 
 MIT licensed. See the bundled `LICENSE <https://github.com/marshmallow-code/marshmallow/blob/dev/LICENSE>`_ file for more details.
+

{marshmallow-3.20.2 → marshmallow-3.21.1}/README.rst

@@ -17,11 +17,6 @@ marshmallow: simplified object serialization
 .. image:: https://readthedocs.org/projects/marshmallow/badge/
    :target: https://marshmallow.readthedocs.io/
    :alt: Documentation
-   
-.. image:: https://badgen.net/badge/code%20style/black/000
-    :target: https://github.com/ambv/black
-    :alt: code style: black
-
 
 **marshmallow** is an ORM/ODM/framework-agnostic library for converting complex datatypes, such as objects, to and from native Python datatypes.
 
@@ -156,7 +151,7 @@ Project Links
 - Docs: https://marshmallow.readthedocs.io/
 - Changelog: https://marshmallow.readthedocs.io/en/latest/changelog.html
 - Contributing Guidelines: https://marshmallow.readthedocs.io/en/latest/contributing.html
-- PyPI: https://pypi.python.org/pypi/marshmallow
+- PyPI: https://pypi.org/project/marshmallow/
 - Issues: https://github.com/marshmallow-code/marshmallow/issues
 - Donate: https://opencollective.com/marshmallow
 

marshmallow-3.21.1/SECURITY.md

@@ -0,0 +1,5 @@
+# Security Contact Information
+
+To report a security vulnerability, please use the
+[Tidelift security contact](https://tidelift.com/security).
+Tidelift will coordinate the fix and disclosure.

{marshmallow-3.20.2 → marshmallow-3.21.1}/docs/conf.py

@@ -1,13 +1,7 @@
-import sys
-import os
-import time
-import datetime as dt
+import importlib.metadata
 
 import alabaster
 
-sys.path.insert(0, os.path.abspath(os.path.join("..", "src")))
-import marshmallow  # noqa: E402
-
 extensions = [
     "sphinx.ext.autodoc",
     "sphinx.ext.intersphinx",
@@ -27,22 +21,13 @@ issues_github_path = "marshmallow-code/marshmallow"
 
 templates_path = ["_templates"]
 
-# Use SOURCE_DATE_EPOCH for reproducible build output https://reproducible-builds.org/docs/source-date-epoch/
-build_date = dt.datetime.utcfromtimestamp(
-    int(os.environ.get("SOURCE_DATE_EPOCH", time.time()))
-)
-
 source_suffix = ".rst"
 master_doc = "index"
 
 project = "marshmallow"
-copyright = (
-    ' {:%Y} <a href="https://stevenloria.com">Steven Loria</a> and contributors'.format(
-        build_date
-    )
-)
+copyright = '<a href="https://stevenloria.com">Steven Loria</a> and contributors'
 
-version = release = marshmallow.__version__
+version = release = importlib.metadata.version("marshmallow")
 
 exclude_patterns = ["_build"]
 
@@ -57,7 +42,6 @@ html_show_sourcelink = False
 
 html_theme_options = {
     "logo": "marshmallow-logo.png",
-    "logo_name": None,
     "description": "Object serialization and deserialization, lightweight and fluffy.",
     "description_font_style": "italic",
     "github_user": "marshmallow-code",
@@ -74,7 +58,7 @@ html_theme_options = {
     "warn_border": "#EEE",
     # Used to populate the useful-links.html template
     "extra_nav_links": {
-        "marshmallow @ PyPI": "https://pypi.python.org/pypi/marshmallow",
+        "marshmallow @ PyPI": "https://pypi.org/project/marshmallow/",
         "marshmallow @ GitHub": "https://github.com/marshmallow-code/marshmallow",
         "Issue Tracker": "https://github.com/marshmallow-code/marshmallow/issues",
         "Ecosystem": "https://github.com/marshmallow-code/marshmallow/wiki/Ecosystem",

{marshmallow-3.20.2 → marshmallow-3.21.1}/docs/upgrading.rst

@@ -62,9 +62,7 @@ Upgrading to 3.0
 Python compatibility
 ********************
 
-The marshmallow 3.x series supports Python >= 3.5.
-
-Python 2.6, 2.7, 3.3, and 3.4 are no longer supported.
+The marshmallow 3.x series supports Python >= 3.8.
 
 
 Schemas are always strict

marshmallow-3.21.1/pyproject.toml

@@ -0,0 +1,90 @@
+[project]
+name = "marshmallow"
+version = "3.21.1"
+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" }]
+maintainers = [
+  { name = "Steven Loria", email = "sloria1@gmail.com" },
+  { name = "Jérôme Lafréchoux", email = "jerome@jolimont.fr" },
+  { name = "Jared Deckard", email = "jared@shademaps.com" },
+]
+classifiers = [
+  "Development Status :: 5 - Production/Stable",
+  "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",
+]
+requires-python = ">=3.8"
+dependencies = ["packaging>=17.0"]
+
+[project.urls]
+Changelog = "https://marshmallow.readthedocs.io/en/latest/changelog.html"
+Funding = "https://opencollective.com/marshmallow"
+Issues = "https://github.com/marshmallow-code/marshmallow/issues"
+Source = "https://github.com/marshmallow-code/marshmallow"
+Tidelift = "https://tidelift.com/subscription/pkg/pypi-marshmallow?utm_source=pypi-marshmallow&utm_medium=pypi"
+
+[project.optional-dependencies]
+docs = [
+  "sphinx==7.2.6",
+  "sphinx-issues==4.0.0",
+  "alabaster==0.7.16",
+  "sphinx-version-warning==1.1.2",
+  "autodocsumm==0.2.12",
+]
+tests = ["pytest", "pytz", "simplejson"]
+dev = ["marshmallow[tests]", "tox", "pre-commit~=3.5"]
+
+[build-system]
+requires = ["flit_core<4"]
+build-backend = "flit_core.buildapi"
+
+[tool.flit.sdist]
+include = [
+  "docs/",
+  "tests/",
+  "CHANGELOG.rst",
+  "CONTRIBUTING.rst",
+  "SECURITY.md",
+  "NOTICE",
+  "tox.ini",
+]
+exclude = ["docs/_build/"]
+
+[tool.ruff]
+src = ["src"]
+fix = true
+show-fixes = true
+show-source = true
+
+[tool.ruff.lint]
+ignore = ["E203", "E266", "E501", "E731"]
+select = [
+  "B",  # flake8-bugbear
+  "E",  # pycodestyle error
+  "F",  # pyflakes
+  "I",  # isort
+  "UP", # pyupgrade
+  "W",  # pycodestyle warning
+]
+
+[tool.ruff.per-file-ignores]
+"tests/*" = ["E721"]
+
+[tool.mypy]
+ignore_missing_imports = true
+warn_unreachable = true
+warn_unused_ignores = true
+warn_redundant_casts = true
+no_implicit_optional = true
+
+[tool.pytest.ini_options]
+norecursedirs = ".git .ropeproject .tox docs env venv tests/mypy_test_cases"
+addopts = "-v --tb=short"

marshmallow-3.21.1/src/marshmallow/__init__.py

@@ -0,0 +1,81 @@
+from __future__ import annotations
+
+import importlib.metadata
+import typing
+
+from packaging.version import Version
+
+from marshmallow.decorators import (
+    post_dump,
+    post_load,
+    pre_dump,
+    pre_load,
+    validates,
+    validates_schema,
+)
+from marshmallow.exceptions import ValidationError
+from marshmallow.schema import Schema, SchemaOpts
+from marshmallow.utils import EXCLUDE, INCLUDE, RAISE, missing, pprint
+
+from . import fields
+
+
+def __getattr__(name: str) -> typing.Any:
+    import warnings
+
+    if name == "__version__":
+        warnings.warn(
+            "The '__version__' attribute is deprecated and will be removed in"
+            " in a future version. Use feature detection or"
+            " 'importlib.metadata.version(\"marshmallow\")' instead.",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        return importlib.metadata.version("marshmallow")
+
+    if name == "__parsed_version__":
+        warnings.warn(
+            "The '__parsed_version__' attribute is deprecated and will be removed in"
+            " in a future version. Use feature detection or"
+            " 'packaging.Version(importlib.metadata.version(\"marshmallow\"))' instead.",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        return Version(importlib.metadata.version("marshmallow"))
+
+    if name == "__version_info__":
+        warnings.warn(
+            "The '__version_info__' attribute is deprecated and will be removed in"
+            " in a future version. Use feature detection or"
+            " 'packaging.Version(importlib.metadata.version(\"marshmallow\")).release' instead.",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        __parsed_version__ = Version(importlib.metadata.version("marshmallow"))
+        __version_info__: tuple[int, int, int] | tuple[
+            int, int, int, str, int
+        ] = __parsed_version__.release  # type: ignore[assignment]
+        if __parsed_version__.pre:
+            __version_info__ += __parsed_version__.pre  # type: ignore[assignment]
+        return __version_info__
+
+    raise AttributeError(name)
+
+
+__all__ = [
+    "EXCLUDE",
+    "INCLUDE",
+    "RAISE",
+    "Schema",
+    "SchemaOpts",
+    "fields",
+    "validates",
+    "validates_schema",
+    "pre_dump",
+    "post_dump",
+    "pre_load",
+    "post_load",
+    "pprint",
+    "ValidationError",
+    "missing",
+]

{marshmallow-3.20.2 → marshmallow-3.21.1}/src/marshmallow/base.py

@@ -8,6 +8,7 @@ These are necessary to avoid circular imports between schema.py and fields.py.
     Users should not need to use this module directly.
 """
 from __future__ import annotations
+
 from abc import ABC, abstractmethod
 
 

{marshmallow-3.20.2 → marshmallow-3.21.1}/src/marshmallow/class_registry.py

@@ -10,6 +10,7 @@ class:`fields.Nested <marshmallow.fields.Nested>`.
 from __future__ import annotations
 
 import typing
+
 from marshmallow.exceptions import RegistryError
 
 if typing.TYPE_CHECKING:
@@ -76,16 +77,16 @@ def get_class(classname: str, all: bool = False) -> list[SchemaType] | SchemaTyp
         classes = _registry[classname]
     except KeyError as error:
         raise RegistryError(
-            "Class with name {!r} was not found. You may need "
-            "to import the class.".format(classname)
+            f"Class with name {classname!r} was not found. You may need "
+            "to import the class."
         ) from error
     if len(classes) > 1:
         if all:
             return _registry[classname]
         raise RegistryError(
-            "Multiple classes with name {!r} "
+            f"Multiple classes with name {classname!r} "
             "were found. Please use the full, "
-            "module-qualified path.".format(classname)
+            "module-qualified path."
         )
     else:
         return _registry[classname][0]

{marshmallow-3.20.2 → marshmallow-3.21.1}/src/marshmallow/exceptions.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 
 import typing
 
-
 # Key used for schema-level validation errors
 SCHEMA = "_schema"
 

{marshmallow-3.20.2 → marshmallow-3.21.1}/src/marshmallow/fields.py

@@ -4,28 +4,30 @@ from __future__ import annotations
 import collections
 import copy
 import datetime as dt
-import numbers
-import uuid
-import ipaddress
 import decimal
+import ipaddress
 import math
+import numbers
 import typing
+import uuid
 import warnings
-from enum import Enum as EnumType
 from collections.abc import Mapping as _Mapping
+from enum import Enum as EnumType
 
-from marshmallow import validate, utils, class_registry, types
+from marshmallow import class_registry, types, utils, validate
 from marshmallow.base import FieldABC, SchemaABC
+from marshmallow.exceptions import (
+    FieldInstanceResolutionError,
+    StringNotCollectionError,
+    ValidationError,
+)
 from marshmallow.utils import (
+    is_aware,
     is_collection,
-    missing as missing_,
     resolve_field_instance,
-    is_aware,
 )
-from marshmallow.exceptions import (
-    ValidationError,
-    StringNotCollectionError,
-    FieldInstanceResolutionError,
+from marshmallow.utils import (
+    missing as missing_,
 )
 from marshmallow.validate import And, Length
 from marshmallow.warnings import RemovedInMarshmallow4Warning
@@ -237,14 +239,12 @@ class Field(FieldABC):
 
     def __repr__(self) -> str:
         return (
-            "<fields.{ClassName}(dump_default={self.dump_default!r}, "
-            "attribute={self.attribute!r}, "
-            "validate={self.validate}, required={self.required}, "
-            "load_only={self.load_only}, dump_only={self.dump_only}, "
-            "load_default={self.load_default}, allow_none={self.allow_none}, "
-            "error_messages={self.error_messages})>".format(
-                ClassName=self.__class__.__name__, self=self
-            )
+            f"<fields.{self.__class__.__name__}(dump_default={self.dump_default!r}, "
+            f"attribute={self.attribute!r}, "
+            f"validate={self.validate}, required={self.required}, "
+            f"load_only={self.load_only}, dump_only={self.dump_only}, "
+            f"load_default={self.load_default}, allow_none={self.allow_none}, "
+            f"error_messages={self.error_messages})>"
         )
 
     def __deepcopy__(self, memo):
@@ -281,9 +281,9 @@ class Field(FieldABC):
         except KeyError as error:
             class_name = self.__class__.__name__
             message = (
-                "ValidationError raised by `{class_name}`, but error key `{key}` does "
+                f"ValidationError raised by `{class_name}`, but error key `{key}` does "
                 "not exist in the `error_messages` dictionary."
-            ).format(class_name=class_name, key=key)
+            )
             raise AssertionError(message) from error
         if isinstance(msg, (str, bytes)):
             msg = msg.format(**kwargs)
@@ -297,9 +297,7 @@ class Field(FieldABC):
             Use `make_error <marshmallow.fields.Field.make_error>` instead.
         """
         warnings.warn(
-            '`Field.fail` is deprecated. Use `raise self.make_error("{}", ...)` instead.'.format(
-                key
-            ),
+            f'`Field.fail` is deprecated. Use `raise self.make_error("{key}", ...)` instead.',
             RemovedInMarshmallow4Warning,
             stacklevel=2,
         )
@@ -611,7 +609,7 @@ class Nested(Field):
                 elif not isinstance(nested, (str, bytes)):
                     raise ValueError(
                         "`Nested` fields must be passed a "
-                        "`Schema`, not {}.".format(nested.__class__)
+                        f"`Schema`, not {nested.__class__}."
                     )
                 elif nested == "self":
                     schema_class = self.root.__class__
@@ -1827,9 +1825,9 @@ class IPInterface(Field):
             return value.exploded
         return value.compressed
 
-    def _deserialize(
-        self, value, attr, data, **kwargs
-    ) -> None | (ipaddress.IPv4Interface | ipaddress.IPv6Interface):
+    def _deserialize(self, value, attr, data, **kwargs) -> None | (
+        ipaddress.IPv4Interface | ipaddress.IPv6Interface
+    ):
         if value is None:
             return None
         try:

{marshmallow-3.20.2 → marshmallow-3.21.1}/src/marshmallow/schema.py

@@ -1,23 +1,21 @@
 """The :class:`Schema` class, including its metaclass and options (class Meta)."""
 from __future__ import annotations
-from abc import ABCMeta
 
-from collections import defaultdict, OrderedDict
-from collections.abc import Mapping
-from functools import lru_cache
+import copy
 import datetime as dt
-import uuid
 import decimal
-import copy
 import inspect
 import json
 import typing
+import uuid
 import warnings
+from abc import ABCMeta
+from collections import OrderedDict, defaultdict
+from collections.abc import Mapping
+from functools import lru_cache
 
-from marshmallow import base, fields as ma_fields, class_registry, types
-from marshmallow.error_store import ErrorStore
-from marshmallow.exceptions import ValidationError, StringNotCollectionError
-from marshmallow.orderedset import OrderedSet
+from marshmallow import base, class_registry, types
+from marshmallow import fields as ma_fields
 from marshmallow.decorators import (
     POST_DUMP,
     POST_LOAD,
@@ -26,15 +24,18 @@ from marshmallow.decorators import (
     VALIDATES,
     VALIDATES_SCHEMA,
 )
+from marshmallow.error_store import ErrorStore
+from marshmallow.exceptions import StringNotCollectionError, ValidationError
+from marshmallow.orderedset import OrderedSet
 from marshmallow.utils import (
-    RAISE,
     EXCLUDE,
     INCLUDE,
-    missing,
-    set_value,
+    RAISE,
     get_value,
     is_collection,
     is_instance_or_subclass,
+    missing,
+    set_value,
     validate_unknown_parameter_value,
 )
 from marshmallow.warnings import RemovedInMarshmallow4Warning
@@ -407,9 +408,7 @@ class Schema(base.SchemaABC, metaclass=SchemaMeta):
         self.error_messages = messages
 
     def __repr__(self) -> str:
-        return "<{ClassName}(many={self.many})>".format(
-            ClassName=self.__class__.__name__, self=self
-        )
+        return f"<{self.__class__.__name__}(many={self.many})>"
 
     @property
     def dict_class(self) -> type:
@@ -1004,7 +1003,7 @@ class Schema(base.SchemaABC, metaclass=SchemaMeta):
                 "The data_key argument for one or more fields collides "
                 "with another field's name or data_key argument. "
                 "Check the following field names and "
-                "data_key arguments: {}".format(list(data_keys_duplicates))
+                f"data_key arguments: {list(data_keys_duplicates)}"
             )
         load_attributes = [obj.attribute or name for name, obj in load_fields.items()]
         if len(load_attributes) != len(set(load_attributes)):
@@ -1015,7 +1014,7 @@ class Schema(base.SchemaABC, metaclass=SchemaMeta):
                 "The attribute argument for one or more fields collides "
                 "with another field's name or attribute argument. "
                 "Check the following field names and "
-                "attribute arguments: {}".format(list(attributes_duplicates))
+                f"attribute arguments: {list(attributes_duplicates)}"
             )
 
         self.fields = fields_dict
@@ -1048,9 +1047,9 @@ class Schema(base.SchemaABC, metaclass=SchemaMeta):
             # the type checker's perspective.
             if isinstance(field_obj, type) and issubclass(field_obj, base.FieldABC):
                 msg = (
-                    'Field for "{field_name}" must be declared as a '
+                    f'Field for "{field_name}" must be declared as a '
                     "Field instance, not a class. "
-                    'Did you mean "fields.{field_obj.__name__}()"?'
+                    f'Did you mean "fields.{field_obj.__name__}()"?'  # type: ignore
                 )
                 raise TypeError(msg) from error
             raise error

{marshmallow-3.20.2 → marshmallow-3.21.1}/src/marshmallow/utils.py

@@ -2,8 +2,8 @@
 from __future__ import annotations
 
 import collections
-import functools
 import datetime as dt
+import functools
 import inspect
 import json
 import re
@@ -311,10 +311,7 @@ def set_value(dct: dict[str, typing.Any], key: str, value: typing.Any):
         target = dct.setdefault(head, {})
         if not isinstance(target, dict):
             raise ValueError(
-                "Cannot set {key} in {head} "
-                "due to existing value: {target}".format(
-                    key=key, head=head, target=target
-                )
+                f"Cannot set {key} in {head} " f"due to existing value: {target}"
             )
         set_value(target, rest, value)
     else: