nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix setting None, NotLoaded and NotAvailable values on fields

Browse source
This commit is contained in:
Romain Bignon 2012-03-26 22:56:10 +02:00
commit 4ea7872ba4
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
weboob/capabilities/base.py
View file

@ -313,14 +313,16 @@ class CapBaseObject(object):
except KeyError: except KeyError:
object.__setattr__(self, name, value) object.__setattr__(self, name, value)
else: else:
try: if value not in (NotLoaded, NotAvailable, None):
# Try to convert value to the wanted one. try:
value = attr.convert(value) # Try to convert value to the wanted one.
except Exception: value = attr.convert(value)
# error during conversion, it will probably not except Exception:
# match the wanted following types, so we'll # error during conversion, it will probably not
# raise ValueError. # match the wanted following types, so we'll
pass # raise ValueError.
pass
if not isinstance(value, attr.types) and \ if not isinstance(value, attr.types) and \
value is not NotLoaded and \ value is not NotLoaded and \
value is not NotAvailable and \ value is not NotAvailable and \