Skip to content

Commit 926270d

Browse files
committed
Fix deprecation warnings
1 parent 1380be9 commit 926270d

File tree

2 files changed

+18
-12
lines changed

2 files changed

+18
-12
lines changed

setup.cfg

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,12 @@ python_files =
1414
tests.py
1515
addopts =
1616
-ra
17-
--strict
17+
--strict-markers
1818
--doctest-modules
1919
--doctest-glob=\*.rst
2020
--tb=short
21+
filterwarnings =
22+
error
2123

2224
[isort]
2325
force_single_line = True

src/desert/_make.py

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ def field_for_schema(
186186
>>> int_field.__class__
187187
<class 'marshmallow.fields.Integer'>
188188
189-
>>> int_field.default
189+
>>> int_field.dump_default
190190
9
191191
>>> field_for_schema(t.Dict[str,str]).__class__
192192
<class 'marshmallow.fields.Dict'>
@@ -200,7 +200,7 @@ def field_for_schema(
200200
<class 'marshmallow_union.Union'>
201201
>>> field_for_schema(t.NewType('UserId', int)).__class__
202202
<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
204204
0
205205
>>> class Color(enum.Enum):
206206
... red = 1
@@ -219,9 +219,9 @@ def field_for_schema(
219219
metadata[_DESERT_SENTINEL] = desert_metadata
220220

221221
if default is not marshmallow.missing:
222-
desert_metadata.setdefault("default", default)
222+
desert_metadata.setdefault("dump_default", default)
223223
desert_metadata.setdefault("allow_none", True)
224-
desert_metadata.setdefault("missing", default)
224+
desert_metadata.setdefault("load_default", default)
225225

226226
field = None
227227

@@ -237,7 +237,7 @@ def field_for_schema(
237237

238238
# Base types
239239
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)
241241

242242
# Generic types
243243
origin = typing_inspect.get_origin(typ)
@@ -279,13 +279,17 @@ def field_for_schema(
279279
elif typing_inspect.is_optional_type(typ):
280280
[subtyp] = (t for t in arguments if t is not NoneType)
281281
# 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+
)
284288
metadata[_DESERT_SENTINEL]["required"] = False
285289

286290
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
289293
field.allow_none = True
290294

291295
elif typing_inspect.is_union_type(typ):
@@ -315,11 +319,11 @@ def field_for_schema(
315319

316320
field.metadata.update(metadata)
317321

318-
for key in ["default", "missing", "required", "marshmallow_field"]:
322+
for key in ["dump_default", "load_default", "required", "marshmallow_field"]:
319323
if key in metadata.keys():
320324
metadata[_DESERT_SENTINEL][key] = metadata.pop(key)
321325

322-
if field.default == field.missing == default == marshmallow.missing:
326+
if field.dump_default == field.load_default == default == marshmallow.missing:
323327
field.required = True
324328

325329
return field

0 commit comments

Comments
 (0)