Skip to content

Commit 37471e3

Browse files
authored
Remove usage of deprecated Field.fail on marshmallow 3 (#425)
1 parent 0fd8007 commit 37471e3

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

CHANGELOG.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
Changelog
22
---------
33

4+
5.5.1 (unreleased)
5+
******************
6+
7+
Bug fixes:
8+
9+
* Remove usage of deprecated ``Field.fail`` when using marshmallow 3.
10+
411
5.5.0 (2019-09-07)
512
******************
613

src/webargs/fields.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
# Expose all fields from marshmallow.fields.
2323
from marshmallow.fields import * # noqa: F40
24+
from webargs.compat import MARSHMALLOW_VERSION_INFO
2425
from webargs.dict2schema import dict2schema
2526

2627
__all__ = ["DelimitedList"] + ma.fields.__all__
@@ -73,5 +74,8 @@ def _deserialize(self, value, attr, data, **kwargs):
7374
else value.split(self.delimiter)
7475
)
7576
except AttributeError:
76-
self.fail("invalid")
77+
if MARSHMALLOW_VERSION_INFO[0] < 3:
78+
self.fail("invalid")
79+
else:
80+
raise self.make_error("invalid")
7781
return super(DelimitedList, self)._deserialize(ret, attr, data, **kwargs)

0 commit comments

Comments
 (0)