marshmallow 3.22.0__py3-none-any.whl → 3.23.1__py3-none-any.whl

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/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)
@@ -1688,6 +1692,7 @@ class Url(String):
 
     :param default: Default value for the field if the attribute is not set.
     :param relative: Whether to allow relative URLs.
+    :param absolute: Whether to allow absolute URLs.
     :param require_tld: Whether to reject non-FQDN hostnames.
     :param schemes: Valid schemes. By default, ``http``, ``https``,
         ``ftp``, and ``ftps`` are allowed.
@@ -1878,7 +1883,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/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
@@ -156,7 +154,7 @@ class SchemaMeta(ABCMeta):
         """
         mro = inspect.getmro(cls)
 
-        hooks = defaultdict(list)  # type: typing.Dict[str, typing.List[typing.Tuple[str, bool, dict]]]
+        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,7 +174,7 @@ class SchemaMeta(ABCMeta):
                 continue
 
             try:
-                hook_config = attr.__marshmallow_hook__  # type: typing.Dict[str, typing.List[typing.Tuple[bool, dict]]]
+                hook_config = attr.__marshmallow_hook__  # type: dict[str, list[tuple[bool, dict]]]
             except AttributeError:
                 pass
             else:
@@ -306,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
 
@@ -321,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[str, typing.List[typing.Tuple[str, bool, dict]]]
+    _declared_fields = {}  # type: dict[str, ma_fields.Field]
+    _hooks = {}  # type: dict[str, list[tuple[str, bool, dict]]]
 
     class Meta:
         """Options object for a Schema.
@@ -400,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)
@@ -415,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
@@ -501,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.
@@ -512,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)
@@ -588,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.
@@ -602,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)
                 ]
@@ -806,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 #####

{marshmallow-3.22.0.dist-info → marshmallow-3.23.1.dist-info}/METADATA

@@ -1,31 +1,30 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: marshmallow
-Version: 3.22.0
+Version: 3.23.1
 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==8.0.2 ; extra == "docs"
-Requires-Dist: sphinx-issues==4.1.0 ; 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.13 ; extra == "docs"
+Requires-Dist: autodocsumm==0.2.14 ; 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
@@ -60,6 +59,19 @@ marshmallow: simplified object serialization
 
 **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/uc55zY0F>`_ of your docs on Fern.
+
+.. image:: https://github.com/user-attachments/assets/69916225-0d61-4bd7-b3b9-e378557673cb
+    :target: https://form.typeform.com/to/uc55zY0F
+    :align: center
+    :alt: Fern logo
+
+Example
+=======
+
 .. code-block:: python
 
     from datetime import date
@@ -102,17 +114,11 @@ Get It Now
 
     $ pip install -U marshmallow
 
-
 Documentation
 =============
 
 Full documentation is available at https://marshmallow.readthedocs.io/ .
 
-Requirements
-============
-
-- Python >= 3.8
-
 Ecosystem
 =========
 

{marshmallow-3.22.0.dist-info → marshmallow-3.23.1.dist-info}/RECORD

@@ -1,18 +1,18 @@
 marshmallow/__init__.py,sha256=C-zbaQJ9dlJLJxotIqTa5OOaD6ojGNRqW8moGrMsGr8,2387
 marshmallow/base.py,sha256=jZ68DZxxSCvRg2GTcxQcf2JjTxqEn-xFNrBEMK3CinU,1346
-marshmallow/class_registry.py,sha256=Uvg-Obos0MejwTrpOHNEH4VF_SfGXKgR-4F2LnCbt1A,2811
+marshmallow/class_registry.py,sha256=kT_kv9KT0EUclIluLD5734ms9P0e65t5aky8y3lipFI,2804
 marshmallow/decorators.py,sha256=vmQFgBgdV0s1Fw8ySyZyQKvjKBTNf5JB3SCldEIl29o,8385
 marshmallow/error_store.py,sha256=A7AxgLMw9ffSmaxRH4x3wcBWibx-DuGH4LwSDpVn50I,2223
 marshmallow/exceptions.py,sha256=DuARdOcirCdJxmlp16V97hQKAXOokvdW12jXtYOlGyk,2326
-marshmallow/fields.py,sha256=3mWgT1TiLzKgdhgWTJYsGe6lVgUz02g8sb63FEEn5hc,72995
+marshmallow/fields.py,sha256=O2CQto3QgSvCK_loCoGZZ_0Ieot8uLGm6vnnlJzzvT8,73167
 marshmallow/orderedset.py,sha256=C2aAG6w1faIL1phinbAltbe3AUAnF5MN6n7fzESNDhI,2922
 marshmallow/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-marshmallow/schema.py,sha256=l71HiKwPPfwIMQxXkr4oUoKybdT_vImoLkuj6ZTnUyg,49044
+marshmallow/schema.py,sha256=C4BsYkDBQbdgDA6w39oSqVlsDx4NfbkT_XtSIKcqxIo,48812
 marshmallow/types.py,sha256=RDS4IfasIehvH2rGWh9e4RTBtsMp-JFFtjApajV22zc,283
 marshmallow/utils.py,sha256=sWciesZ6tS08uX9Z9fzu2lbuut5eh8TKABU-TwgqSms,11886
 marshmallow/validate.py,sha256=hS7fYC6byDHK9A7A4is0McDMZEzu6GkKke-7unLt2hE,23857
 marshmallow/warnings.py,sha256=vHQu7AluuWqLhvlw5noXtWWbya13zDXY6JMaVSUzmDs,65
-marshmallow-3.22.0.dist-info/LICENSE,sha256=kGtdkFHkJhRMsXOtkRZnuOvQWpxYTCwmwTWzKj7RIAE,1064
-marshmallow-3.22.0.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-marshmallow-3.22.0.dist-info/METADATA,sha256=7rCpX93_5nP-u7BEcVtaAa56-99xuwHcg-ALtEgm4-w,7225
-marshmallow-3.22.0.dist-info/RECORD,,
+marshmallow-3.23.1.dist-info/LICENSE,sha256=kGtdkFHkJhRMsXOtkRZnuOvQWpxYTCwmwTWzKj7RIAE,1064
+marshmallow-3.23.1.dist-info/WHEEL,sha256=-ta_u8-23-bwm4JkHhR_rJkpb_X1cxtvIsLH0KOv1sU,82
+marshmallow-3.23.1.dist-info/METADATA,sha256=TxU1K0BGtqGb3Ri_EMHXnOfyNiZcl8lHJhsMFHCVOiA,7537
+marshmallow-3.23.1.dist-info/RECORD,,

{marshmallow-3.22.0.dist-info → marshmallow-3.23.1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: flit 3.9.0
+Generator: flit 3.10.0
 Root-Is-Purelib: true
 Tag: py3-none-any