lint

python-attrs · redruin1 · Apr 1, 2025 · Apr 2, 2025 · Apr 2, 2025 · Apr 2, 2025
commit 9f8b9dcff6583b6c987596b5d2e07ac07e179351
diff --git a/bench/test_attrs_omit_defaults.py b/bench/test_attrs_omit_defaults.py
@@ -3,7 +3,7 @@
 import attr
 import pytest

-from cattr import BaseConverter, Converter, UnstructureStrategy
+from cattr import Converter, UnstructureStrategy


 class E(IntEnum):

diff --git a/src/cattrs/converters.py b/src/cattrs/converters.py
@@ -11,7 +11,7 @@
 from pathlib import Path
 from typing import Any, Optional, Tuple, TypeVar, overload

-from attrs import Attribute, Factory, resolve_types
+from attrs import Attribute, resolve_types
 from attrs import has as attrs_has

 from ._compat import (
@@ -1248,7 +1248,11 @@ def gen_unstructure_attrs_fromdict(
        }

        return make_dict_unstructure_fn(
-            cl, self, _cattrs_omit_if_default=self.omit_if_default, _cattrs_omit_if=self.omit_if, **attrib_overrides
+            cl,
+            self,
+            _cattrs_omit_if_default=self.omit_if_default,
+            _cattrs_omit_if=self.omit_if,
+            **attrib_overrides,
        )

    def gen_unstructure_optional(self, cl: type[T]) -> Callable[[T], Any]:

diff --git a/src/cattrs/gen/__init__.py b/src/cattrs/gen/__init__.py
@@ -64,13 +64,7 @@ def override(
    :param omit: Whether to skip the field or not. `None` means apply default handling.
    """
    return AttributeOverride(
-        omit_if_default, 
-        rename,
-        location, 
-        omit,
-        omit_if,
-        struct_hook, 
-        unstruct_hook
+        omit_if_default, rename, location, omit, omit_if, struct_hook, unstruct_hook
    )


@@ -101,7 +95,7 @@ def make_dict_unstructure_fn_from_attrs(
        module name and qualname.
    :param _cattrs_omit_if_default: If true, attributes equal to their default values
        will be omitted in the result dictionary.
-    :param _cattrs_omit: Omits the attribute (at runtime) if the passed-in value 
+    :param _cattrs_omit: Omits the attribute (at runtime) if the passed-in value
        evaluates to true.
    :param _cattrs_use_alias: If true, the attribute alias will be used as the
        dictionary key by default.
@@ -195,14 +189,18 @@ def make_dict_unstructure_fn_from_attrs(
                lines.append(f"  if instance.{attr_name} != {def_name}:")
                lines.append(f"    res['{kn}'] = {invoke}")

-        elif omit_if: # callable
+        elif omit_if:  # callable
            omit_callable = f"__c_omit_{attr_name}"
            attr_attr = f"__c_attr_{attr_name}"

-            lines.append(f"  if not {omit_callable}(instance, {attr_attr}, instance.{attr_name}):")
+            lines.append(
+                f"  if not {omit_callable}(instance, {attr_attr}, instance.{attr_name}):"
+            )
            lines.append(f"    res['{kn}'] = {invoke}")

-            globs[omit_callable] = omit_if # _cattrs_omit_if if override.omit_if is None else override.omit_if
+            globs[omit_callable] = (
+                omit_if  # _cattrs_omit_if if override.omit_if is None else override.omit_if
+            )
            globs[attr_attr] = a

        else:
@@ -235,7 +233,6 @@ def make_dict_unstructure_fn_from_attrs(

    return res

-_never = lambda instance, attribute, value: False

 def make_dict_unstructure_fn(
    cl: type[T],

diff --git a/src/cattrs/gen/_consts.py b/src/cattrs/gen/_consts.py
@@ -10,9 +10,11 @@
 class AttributeOverride:
    omit_if_default: bool | None = None
    rename: str | None = None
-    location: str | tuple[str] | None = None,
+    location: str | tuple[str] | None = (None,)
    omit: bool | None = None  # Omit the field completely.
-    omit_if: Callable[[Any, Any, Any], bool] | bool | None = None # Omit if callable returns True.
+    omit_if: Callable[[Any, Any, Any], bool] | bool | None = (
+        None  # Omit if callable returns True.
+    )
    struct_hook: Callable[[Any, Any], Any] | None = None  # Structure hook to use.
    unstruct_hook: Callable[[Any], Any] | None = None  # Structure hook to use.


diff --git a/tests/test_gen_dict.py b/tests/test_gen_dict.py
@@ -295,29 +295,30 @@ class Example:
        c: int = 123
        d: set = field(factory=set)
        e: int = field()
+
        @e.default
        def e_default(self) -> int:
            return self.c
+
        overridden: bool = None

    def default_or_none(instance, attribute, value):
        if value is None:
            return True
-        elif isinstance(attribute.default, Factory):
+        if isinstance(attribute.default, Factory):
            if attribute.default.takes_self:
                return value == attribute.default.factory(instance)
-            else:
-                return value == attribute.default.factory()
-        else:
-            return value == attribute.default
+            return value == attribute.default.factory()
+        return value == attribute.default

    converter.register_unstructure_hook(
-        Example, make_dict_unstructure_fn(
+        Example,
+        make_dict_unstructure_fn(
            Example,
            converter,
            _cattrs_omit_if=default_or_none,
-            overridden=override(omit_if=False)
-        )
+            overridden=override(omit_if=False),
+        ),
    )

    assert converter.unstructure(Example(100, None)) == {"a": 100, "overridden": None}