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

json formatter: all subobjects are also encoded

Browse source
This commit is contained in:
Romain Bignon 2013-12-22 22:12:03 +01:00
commit 818b756e27
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
weboob/tools/application/formatters/json.py
View file

@ -19,6 +19,7 @@
from weboob.tools.json import json from weboob.tools.json import json
from weboob.capabilities.base import NotAvailable, NotLoaded
from .iformatter import IFormatter from .iformatter import IFormatter
@ -32,12 +33,14 @@ class Encoder(json.JSONEncoder):
try: try:
return json.JSONEncoder.default(self, obj) return json.JSONEncoder.default(self, obj)
except TypeError: except TypeError:
if obj is NotAvailable or obj is NotLoaded:
return None
try: try:
dct = obj.to_dict() dct = obj.to_dict()
except AttributeError: except AttributeError:
return str(obj) return str(obj)
for z in dct.itervalues(): return dct
return z
class JsonFormatter(IFormatter): class JsonFormatter(IFormatter):