fix setting None, NotLoaded and NotAvailable values on fields
This commit is contained in:
parent
3a44948b7c
commit
4ea7872ba4
1 changed files with 10 additions and 8 deletions
|
|
@ -313,14 +313,16 @@ class CapBaseObject(object):
|
|||
except KeyError:
|
||||
object.__setattr__(self, name, value)
|
||||
else:
|
||||
try:
|
||||
# Try to convert value to the wanted one.
|
||||
value = attr.convert(value)
|
||||
except Exception:
|
||||
# error during conversion, it will probably not
|
||||
# match the wanted following types, so we'll
|
||||
# raise ValueError.
|
||||
pass
|
||||
if value not in (NotLoaded, NotAvailable, None):
|
||||
try:
|
||||
# Try to convert value to the wanted one.
|
||||
value = attr.convert(value)
|
||||
except Exception:
|
||||
# error during conversion, it will probably not
|
||||
# match the wanted following types, so we'll
|
||||
# raise ValueError.
|
||||
pass
|
||||
|
||||
if not isinstance(value, attr.types) and \
|
||||
value is not NotLoaded and \
|
||||
value is not NotAvailable and \
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue