This commit is contained in:
Eriks Karls 2019-09-27 11:20:00 +03:00
parent 3f1b0018b2
commit 0ca0f49f92

View File

@ -982,6 +982,7 @@ class Reporter:
class MyJSONEncoder(JSONEncoder): class MyJSONEncoder(JSONEncoder):
def default(self, o): def default(self, o):
from erepublik.citizen import Citizen
if isinstance(o, decimal.Decimal): if isinstance(o, decimal.Decimal):
return float("{:.02f}".format(o)) return float("{:.02f}".format(o))
elif isinstance(o, datetime.datetime): elif isinstance(o, datetime.datetime):
@ -998,6 +999,8 @@ class MyJSONEncoder(JSONEncoder):
return o.__dict__ return o.__dict__
elif isinstance(o, deque): elif isinstance(o, deque):
return list(o) return list(o)
elif isinstance(o, Citizen):
return o.to_json()
return super().default(o) return super().default(o)