marshmallow 3.21.1__tar.gz → 3.21.3__tar.gz

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

@@ -1,6 +1,22 @@
 Changelog
 ---------
 
+3.21.3 (2024-06-05)
+*******************
+
+Bug fixes:
+
+- Fix memory leak that prevented schema instances from getting GC'd (:pr:`2277`).
+  Thanks :user:`mrcljx` for the PR.
+
+3.21.2 (2024-05-01)
+*******************
+
+Bug fixes:
+
+- Allow timestamp 0 in ``fields.DateTime`` (:issue:`2133`).
+  Thanks :user:`flydzen` for reporting.
+
 3.21.1 (2024-03-04)
 *******************
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: marshmallow
-Version: 3.21.1
+Version: 3.21.3
 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>
@@ -19,8 +19,8 @@ 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.2.6 ; extra == "docs"
-Requires-Dist: sphinx-issues==4.0.0 ; extra == "docs"
+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: sphinx-version-warning==1.1.2 ; extra == "docs"
 Requires-Dist: autodocsumm==0.2.12 ; extra == "docs"
@@ -157,10 +157,6 @@ Your logo will show up here with a link to your website. [`Become a sponsor`_]
 
 .. _`Become a sponsor`: https://opencollective.com/marshmallow#sponsor
 
-.. image:: https://opencollective.com/marshmallow/sponsor/0/avatar.svg
-    :target: https://opencollective.com/marshmallow/sponsor/0/website
-    :alt: Sponsors
-
 .. image:: https://opencollective.com/static/images/become_sponsor.svg
     :target: https://opencollective.com/marshmallow#sponsor
     :alt: Become a sponsor

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

@@ -119,10 +119,6 @@ Your logo will show up here with a link to your website. [`Become a sponsor`_]
 
 .. _`Become a sponsor`: https://opencollective.com/marshmallow#sponsor
 
-.. image:: https://opencollective.com/marshmallow/sponsor/0/avatar.svg
-    :target: https://opencollective.com/marshmallow/sponsor/0/website
-    :alt: Sponsors
-
 .. image:: https://opencollective.com/static/images/become_sponsor.svg
     :target: https://opencollective.com/marshmallow#sponsor
     :alt: Become a sponsor

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

@@ -1,6 +1,6 @@
 [project]
 name = "marshmallow"
-version = "3.21.1"
+version = "3.21.3"
 description = "A lightweight library for converting complex datatypes to and from native Python datatypes."
 readme = "README.rst"
 license = { file = "LICENSE" }
@@ -33,8 +33,8 @@ Tidelift = "https://tidelift.com/subscription/pkg/pypi-marshmallow?utm_source=py
 
 [project.optional-dependencies]
 docs = [
-  "sphinx==7.2.6",
-  "sphinx-issues==4.0.0",
+  "sphinx==7.3.7",
+  "sphinx-issues==4.1.0",
   "alabaster==0.7.16",
   "sphinx-version-warning==1.1.2",
   "autodocsumm==0.2.12",
@@ -62,7 +62,10 @@ exclude = ["docs/_build/"]
 src = ["src"]
 fix = true
 show-fixes = true
-show-source = true
+output-format = "full"
+
+[tool.ruff.format]
+docstring-code-format = true
 
 [tool.ruff.lint]
 ignore = ["E203", "E266", "E501", "E731"]
@@ -75,7 +78,7 @@ select = [
   "W",  # pycodestyle warning
 ]
 
-[tool.ruff.per-file-ignores]
+[tool.ruff.lint.per-file-ignores]
 "tests/*" = ["E721"]
 
 [tool.mypy]

{marshmallow-3.21.1 → marshmallow-3.21.3}/src/marshmallow/__init__.py

@@ -52,9 +52,9 @@ def __getattr__(name: str) -> typing.Any:
             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]
+        __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__

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

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

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

@@ -7,6 +7,7 @@ class:`fields.Nested <marshmallow.fields.Nested>`.
     This module is treated as private API.
     Users should not need to use this module directly.
 """
+
 from __future__ import annotations
 
 import typing
@@ -35,7 +36,8 @@ def register(classname: str, cls: SchemaType) -> None:
         class MyClass:
             pass
 
-        register('MyClass', MyClass)
+
+        register("MyClass", MyClass)
         # Registry:
         # {
         #   'MyClass': [path.to.MyClass],

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

@@ -15,39 +15,45 @@ signature.
 Example: ::
 
     from marshmallow import (
-        Schema, pre_load, pre_dump, post_load, validates_schema,
-        validates, fields, ValidationError
+        Schema,
+        pre_load,
+        pre_dump,
+        post_load,
+        validates_schema,
+        validates,
+        fields,
+        ValidationError,
     )
 
-    class UserSchema(Schema):
 
+    class UserSchema(Schema):
         email = fields.Str(required=True)
         age = fields.Integer(required=True)
 
         @post_load
         def lowerstrip_email(self, item, many, **kwargs):
-            item['email'] = item['email'].lower().strip()
+            item["email"] = item["email"].lower().strip()
             return item
 
         @pre_load(pass_many=True)
         def remove_envelope(self, data, many, **kwargs):
-            namespace = 'results' if many else 'result'
+            namespace = "results" if many else "result"
             return data[namespace]
 
         @post_dump(pass_many=True)
         def add_envelope(self, data, many, **kwargs):
-            namespace = 'results' if many else 'result'
+            namespace = "results" if many else "result"
             return {namespace: data}
 
         @validates_schema
         def validate_email(self, data, **kwargs):
-            if len(data['email']) < 3:
-                raise ValidationError('Email must be more than 3 characters', 'email')
+            if len(data["email"]) < 3:
+                raise ValidationError("Email must be more than 3 characters", "email")
 
-        @validates('age')
+        @validates("age")
         def validate_age(self, data, **kwargs):
             if data < 14:
-                raise ValidationError('Too young!')
+                raise ValidationError("Too young!")
 
 .. note::
     These decorators only work with instance methods. Class and static
@@ -58,6 +64,7 @@ Example: ::
     If you need to guarantee order of different processing steps, you should put
     them in the same processing method.
 """
+
 from __future__ import annotations
 
 import functools

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

@@ -1,4 +1,5 @@
 """Exception classes for marshmallow-related errors."""
+
 from __future__ import annotations
 
 import typing

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

@@ -1,4 +1,5 @@
 """Field classes for various types of data."""
+
 from __future__ import annotations
 
 import collections
@@ -393,7 +394,7 @@ class Field(FieldABC):
             class TitleCase(Field):
                 def _serialize(self, value, attr, obj, **kwargs):
                     if not value:
-                        return ''
+                        return ""
                     return str(value).title()
 
         :param value: The value to be serialized.
@@ -495,6 +496,7 @@ class Nested(Field):
             parent = fields.Nested(lambda: ParentSchema(only=("id",)), dump_only=True)
             siblings = fields.List(fields.Nested(lambda: ChildSchema(only=("id", "name"))))
 
+
         class ParentSchema(Schema):
             id = fields.Str()
             children = fields.List(
@@ -511,10 +513,10 @@ class Nested(Field):
     ::
 
         # Yes
-        author = fields.Nested(UserSchema, only=('id', 'name'))
+        author = fields.Nested(UserSchema, only=("id", "name"))
 
         # No
-        author = fields.Nested(UserSchema(), only=('id', 'name'))
+        author = fields.Nested(UserSchema(), only=("id", "name"))
 
     :param nested: `Schema` instance, class, class name (string), dictionary, or callable that
         returns a `Schema` or dictionary. Dictionaries are converted with `Schema.from_dict`.
@@ -626,7 +628,7 @@ class Nested(Field):
         return self._schema
 
     def _nested_normalized_option(self, option_name: str) -> list[str]:
-        nested_field = "%s." % self.name
+        nested_field = f"{self.name}."
         return [
             field.split(nested_field, 1)[1]
             for field in getattr(self.root, option_name, set())
@@ -676,16 +678,18 @@ class Pluck(Nested):
 
         from marshmallow import Schema, fields
 
+
         class ArtistSchema(Schema):
             id = fields.Int()
             name = fields.Str()
 
+
         class AlbumSchema(Schema):
-            artist = fields.Pluck(ArtistSchema, 'id')
+            artist = fields.Pluck(ArtistSchema, "id")
 
 
-        in_data = {'artist': 42}
-        loaded = AlbumSchema().load(in_data) # => {'artist': {'id': 42}}
+        in_data = {"artist": 42}
+        loaded = AlbumSchema().load(in_data)  # => {'artist': {'id': 42}}
         dumped = AlbumSchema().dump(loaded)  # => {'artist': 42}
 
     :param Schema nested: The Schema class or class name (string)
@@ -1281,8 +1285,6 @@ class DateTime(Field):
         return value.strftime(data_format)
 
     def _deserialize(self, value, attr, data, **kwargs) -> dt.datetime:
-        if not value:  # Falsy values, e.g. '', None, [] are not valid
-            raise self.make_error("invalid", input=value, obj_type=self.OBJ_TYPE)
         data_format = self.format or self.DEFAULT_FORMAT
         func = self.DESERIALIZATION_FUNCS.get(data_format)
         try:

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

@@ -1,4 +1,5 @@
 """The :class:`Schema` class, including its metaclass and options (class Meta)."""
+
 from __future__ import annotations
 
 import copy
@@ -12,7 +13,6 @@ 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, class_registry, types
 from marshmallow import fields as ma_fields
@@ -1055,7 +1055,6 @@ class Schema(base.SchemaABC, metaclass=SchemaMeta):
             raise error
         self.on_bind_field(field_name, field_obj)
 
-    @lru_cache(maxsize=8)  # noqa (https://github.com/PyCQA/flake8-bugbear/issues/310)
     def _has_processors(self, tag) -> bool:
         return bool(self._hooks[(tag, True)] or self._hooks[(tag, False)])
 

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

@@ -4,6 +4,7 @@
 
     This module is provisional. Types may be modified, added, and removed between minor releases.
 """
+
 import typing
 
 StrSequenceOrSet = typing.Union[typing.Sequence[str], typing.AbstractSet[str]]

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

@@ -1,4 +1,5 @@
 """Utility methods for marshmallow."""
+
 from __future__ import annotations
 
 import collections
@@ -191,6 +192,8 @@ def from_iso_date(value):
 
 
 def from_timestamp(value: typing.Any) -> dt.datetime:
+    if value is True or value is False:
+        raise ValueError("Not a valid POSIX timestamp")
     value = float(value)
     if value < 0:
         raise ValueError("Not a valid POSIX timestamp")

{marshmallow-3.21.1 → marshmallow-3.21.3}/src/marshmallow/validate.py

@@ -1,4 +1,5 @@
 """Validation classes for various types of data."""
+
 from __future__ import annotations
 
 import re
@@ -36,8 +37,7 @@ class Validator(ABC):
         return ""
 
     @abstractmethod
-    def __call__(self, value: typing.Any) -> typing.Any:
-        ...
+    def __call__(self, value: typing.Any) -> typing.Any: ...
 
 
 class And(Validator):
@@ -47,10 +47,12 @@ class And(Validator):
 
         from marshmallow import validate, ValidationError
 
+
         def is_even(value):
             if value % 2 != 0:
                 raise ValidationError("Not an even value.")
 
+
         validator = validate.And(validate.Range(min=0), is_even)
         validator(-1)
         # ValidationError: ['Must be greater than or equal to 0.', 'Not an even value.']
@@ -334,9 +336,7 @@ class Range(Validator):
         )
 
     def _repr_args(self) -> str:
-        return "min={!r}, max={!r}, min_inclusive={!r}, max_inclusive={!r}".format(
-            self.min, self.max, self.min_inclusive, self.max_inclusive
-        )
+        return f"min={self.min!r}, max={self.max!r}, min_inclusive={self.min_inclusive!r}, max_inclusive={self.max_inclusive!r}"
 
     def _format_error(self, value: _T, message: str) -> str:
         return (self.error or message).format(input=value, min=self.min, max=self.max)
@@ -486,12 +486,10 @@ class Regexp(Validator):
         return self.error.format(input=value, regex=self.regex.pattern)
 
     @typing.overload
-    def __call__(self, value: str) -> str:
-        ...
+    def __call__(self, value: str) -> str: ...
 
     @typing.overload
-    def __call__(self, value: bytes) -> bytes:
-        ...
+    def __call__(self, value: bytes) -> bytes: ...
 
     def __call__(self, value):
         if self.regex.match(value) is None:

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

@@ -1,4 +1,5 @@
 """Test utilities and fixtures."""
+
 import datetime as dt
 import functools
 import uuid

{marshmallow-3.21.1 → marshmallow-3.21.3}/tests/conftest.py

@@ -1,4 +1,5 @@
 """Pytest fixtures that are available in all test modules."""
+
 import pytest
 
 from tests.base import Blog, User, UserSchema

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

@@ -422,6 +422,9 @@ class TestFieldDeserialization:
         [
             "not-a-datetime",
             42,
+            True,
+            False,
+            0,
             "",
             [],
             "2018",
@@ -576,7 +579,7 @@ class TestFieldDeserialization:
     @pytest.mark.parametrize("fmt", ["timestamp", "timestamp_ms"])
     @pytest.mark.parametrize(
         "in_value",
-        ["", "!@#", 0, -1, dt.datetime(2013, 11, 10, 1, 23, 45)],
+        ["", "!@#", -1, dt.datetime(2013, 11, 10, 1, 23, 45)],
     )
     def test_invalid_timestamp_field_deserialization(self, fmt, in_value):
         field = fields.DateTime(format=fmt)
@@ -1288,7 +1291,7 @@ class TestFieldDeserialization:
         assert MethodDeserializeOnly().load({"name": "ALEC"})["name"] == "alec"
 
     def test_datetime_list_field_deserialization(self):
-        dtimes = dt.datetime.now(), dt.datetime.now(), dt.datetime.utcnow()
+        dtimes = dt.datetime.now(), dt.datetime.now(), dt.datetime.now(dt.timezone.utc)
         dstrings = [each.isoformat() for each in dtimes]
         field = fields.List(fields.DateTime())
         result = field.deserialize(dstrings)

{marshmallow-3.21.1 → marshmallow-3.21.3}/tests/test_schema.py

@@ -85,7 +85,7 @@ def test_load_validation_error_stores_input_data_and_valid_data():
 
     schema = MySchema()
     input_data = {
-        "always_valid": dt.datetime.utcnow().isoformat(),
+        "always_valid": dt.datetime.now(dt.timezone.utc).isoformat(),
         "always_invalid": 24,
     }
     try:

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

@@ -1,4 +1,5 @@
 """Tests for field serialization."""
+
 import datetime as dt
 import decimal
 import ipaddress
@@ -826,7 +827,7 @@ class TestFieldSerialization:
             fields.TimeDelta(fields.TimeDelta.SECONDS, str)
 
     def test_datetime_list_field(self):
-        obj = DateTimeList([dt.datetime.utcnow(), dt.datetime.now()])
+        obj = DateTimeList([dt.datetime.now(dt.timezone.utc), dt.datetime.now()])
         field = fields.List(fields.DateTime)
         result = field.serialize("dtimes", obj)
         assert all(type(each) is str for each in result)
@@ -838,7 +839,7 @@ class TestFieldSerialization:
 
     def test_list_field_work_with_generator_single_value(self):
         def custom_generator():
-            yield dt.datetime.utcnow()
+            yield dt.datetime.now(dt.timezone.utc)
 
         obj = DateTimeList(custom_generator())
         field = fields.List(fields.DateTime)
@@ -847,7 +848,7 @@ class TestFieldSerialization:
 
     def test_list_field_work_with_generators_multiple_values(self):
         def custom_generator():
-            yield from [dt.datetime.utcnow(), dt.datetime.now()]
+            yield from [dt.datetime.now(dt.timezone.utc), dt.datetime.now()]
 
         obj = DateTimeList(custom_generator())
         field = fields.List(fields.DateTime)
@@ -909,7 +910,7 @@ class TestFieldSerialization:
             fields.List(ASchema)
 
     def test_datetime_integer_tuple_field(self):
-        obj = DateTimeIntegerTuple((dt.datetime.utcnow(), 42))
+        obj = DateTimeIntegerTuple((dt.datetime.now(dt.timezone.utc), 42))
         field = fields.Tuple([fields.DateTime, fields.Integer])
         result = field.serialize("dtime_int", obj)
         assert type(result[0]) is str