Respecting default value in defined for attribute within attr class w…

…hile structuring
shwetas1205 · Oct 27, 2017 · 7d6d6fa · 7d6d6fa
1 parent 02d9da0
commit 7d6d6fa
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/cattr/converters.py b/cattr/converters.py
@@ -283,12 +283,12 @@ def _structure_attr_from_dict(self, a, name, mapping):
         type_ = a.metadata.get(TYPE_METADATA_KEY)
         if type_ is None:
             # No type.
-            return mapping[name]
+            return mapping.get(name, a.default)
         if _is_union_type(type_):
             # This is a union.
             val = mapping.get(name, NOTHING)
             if NoneType in type_.__args__ and val is NOTHING:
-                return None
+                return a.default
             return self._structure_union(val, type_)
         return self._structure.dispatch(type_)(mapping.get(a.name), type_)