@@ -186,7 +186,7 @@ def field_for_schema(
186
186
>>> int_field.__class__
187
187
<class 'marshmallow.fields.Integer'>
188
188
189
- >>> int_field.default
189
+ >>> int_field.dump_default
190
190
9
191
191
>>> field_for_schema(t.Dict[str,str]).__class__
192
192
<class 'marshmallow.fields.Dict'>
@@ -200,7 +200,7 @@ def field_for_schema(
200
200
<class 'marshmallow_union.Union'>
201
201
>>> field_for_schema(t.NewType('UserId', int)).__class__
202
202
<class 'marshmallow.fields.Integer'>
203
- >>> field_for_schema(t.NewType('UserId', int), default=0).default
203
+ >>> field_for_schema(t.NewType('UserId', int), default=0).dump_default
204
204
0
205
205
>>> class Color(enum.Enum):
206
206
... red = 1
@@ -219,9 +219,9 @@ def field_for_schema(
219
219
metadata [_DESERT_SENTINEL ] = desert_metadata
220
220
221
221
if default is not marshmallow .missing :
222
- desert_metadata .setdefault ("default " , default )
222
+ desert_metadata .setdefault ("dump_default " , default )
223
223
desert_metadata .setdefault ("allow_none" , True )
224
- desert_metadata .setdefault ("missing " , default )
224
+ desert_metadata .setdefault ("load_default " , default )
225
225
226
226
field = None
227
227
@@ -237,7 +237,7 @@ def field_for_schema(
237
237
238
238
# Base types
239
239
if not field and typ in _native_to_marshmallow :
240
- field = _native_to_marshmallow [typ ](default = default )
240
+ field = _native_to_marshmallow [typ ](dump_default = default )
241
241
242
242
# Generic types
243
243
origin = typing_inspect .get_origin (typ )
@@ -279,13 +279,17 @@ def field_for_schema(
279
279
elif typing_inspect .is_optional_type (typ ):
280
280
[subtyp ] = (t for t in arguments if t is not NoneType )
281
281
# Treat optional types as types with a None default
282
- metadata [_DESERT_SENTINEL ]["default" ] = metadata .get ("default" , None )
283
- metadata [_DESERT_SENTINEL ]["missing" ] = metadata .get ("missing" , None )
282
+ metadata [_DESERT_SENTINEL ]["dump_default" ] = metadata .get (
283
+ "dump_default" , None
284
+ )
285
+ metadata [_DESERT_SENTINEL ]["load_default" ] = metadata .get (
286
+ "load_default" , None
287
+ )
284
288
metadata [_DESERT_SENTINEL ]["required" ] = False
285
289
286
290
field = field_for_schema (subtyp , metadata = metadata , default = None )
287
- field .default = None
288
- field .missing = None
291
+ field .dump_default = None
292
+ field .load_default = None
289
293
field .allow_none = True
290
294
291
295
elif typing_inspect .is_union_type (typ ):
@@ -315,11 +319,11 @@ def field_for_schema(
315
319
316
320
field .metadata .update (metadata )
317
321
318
- for key in ["default " , "missing " , "required" , "marshmallow_field" ]:
322
+ for key in ["dump_default " , "load_default " , "required" , "marshmallow_field" ]:
319
323
if key in metadata .keys ():
320
324
metadata [_DESERT_SENTINEL ][key ] = metadata .pop (key )
321
325
322
- if field .default == field .missing == default == marshmallow .missing :
326
+ if field .dump_default == field .load_default == default == marshmallow .missing :
323
327
field .required = True
324
328
325
329
return field
0 commit comments