Fixes

Author: Tinche

src/cattrs/gen.py

@@ -284,6 +284,8 @@ def make_dict_structure_fn(
         for a in attrs:
             an = a.name
             override = kwargs.get(an, _neutral)
+            if override.omit:
+                continue
             t = a.type
             if isinstance(t, TypeVar):
                 t = mapping.get(t.__name__, t)
@@ -318,9 +320,7 @@ def make_dict_structure_fn(
             if a.default is not NOTHING:
                 lines.append(f"{i}if '{kn}' in o:")
                 i = f"{i}  "
-                lines.append(f"{i}try:")
-            else:
-                lines.append(f"{i}try:")
+            lines.append(f"{i}try:")
             i = f"{i}  "
             if handler:
                 if handler == converter._structure_call:
@@ -680,7 +680,7 @@ def make_mapping_structure_fn(
 
     if is_bare_dict:
         # No args, it's a bare dict.
-        lines.append("    res = dict(mapping)")
+        lines.append("  res = dict(mapping)")
     else:
         if extended_validation:
             globs["enumerate"] = enumerate
@@ -708,11 +708,12 @@ def make_mapping_structure_fn(
                 f"  res = {{{k_s}: {v_s} for k, v in mapping.items()}}"
             )
     if structure_to is not dict:
-        lines.append("    res = __cattr_mapping_cl(res)")
+        lines.append("  res = __cattr_mapping_cl(res)")
 
-    total_lines = lines + ["    return res"]
+    total_lines = lines + ["  return res"]
+    script = "\n".join(total_lines)
 
-    eval(compile("\n".join(total_lines), "", "exec"), globs)
+    eval(compile(script, "", "exec"), globs)
 
     fn = globs[fn_name]
 

tests/metadata/test_genconverter.py

@@ -31,12 +31,12 @@
 unstructure_strats = sampled_from(list(UnstructureStrategy))
 
 
-@given(simple_typed_classes() | simple_typed_dataclasses(), unstructure_strats)
-def test_simple_roundtrip(cls_and_vals, strat):
+@given(simple_typed_classes() | simple_typed_dataclasses(), unstructure_strats, booleans())
+def test_simple_roundtrip(cls_and_vals, strat, extended_validation):
     """
     Simple classes with metadata can be unstructured and restructured.
     """
-    converter = Converter(unstruct_strat=strat)
+    converter = Converter(unstruct_strat=strat, extended_validation=extended_validation)
     cl, vals = cls_and_vals
     inst = cl(*vals)
     unstructured = converter.unstructure(inst)

tests/test_gen_dict.py

@@ -255,7 +255,8 @@ class A:
     assert converter.unstructure(A(1)) == {"a": 1}
 
 
-def test_omitting_structure():
+@pytest.mark.parametrize("extended_validation", [True, False])
+def test_omitting_structure(extended_validation: bool):
     """Omitting fields works with generated structuring functions."""
     converter = Converter()
 
@@ -268,7 +269,7 @@ class A:
     converter.register_structure_hook(
         A,
         make_dict_structure_fn(
-            A, converter, b=override(omit=True), c=override(omit=True)
+            A, converter, b=override(omit=True), c=override(omit=True), _cattrs_extended_validation=extended_validation
         ),
     )
 

tests/test_generics.py

@@ -65,8 +65,9 @@ def test_able_to_structure_generics(converter: Converter, t, t2, result):
 )
 @pytest.mark.parametrize("extended_validation", [True, False])
 def test_structure_generics_with_cols(t, result, extended_validation):
+    raw = asdict(result)
     res = GenConverter(extended_validation=extended_validation).structure(
-        asdict(result), GenericCols[t]
+        raw, GenericCols[t]
     )
 
     assert res == result