Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
app.register_blueprint(amiibofullApp)

CORS(app)
app.json_encoder = AmiiboJSONEncoder
app.json = AmiiboJSONEncoder(app)
Compress(app)

amiibo_manager = AmiiboManager.getInstance()
Expand Down
4 changes: 2 additions & 2 deletions commons/amiibo_json_encounter.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import datetime

from flask.json import JSONEncoder
from flask.json.provider import DefaultJSONProvider

from amiibo.amiibo import (Amiibo,
AmiiboReleaseDates,
Expand All @@ -11,7 +11,7 @@
Hex)
from amiibo.filterable import FilterableCollection

class AmiiboJSONEncoder(JSONEncoder):
class AmiiboJSONEncoder(DefaultJSONProvider):
def default(self, obj):
if isinstance(obj, Hex):
return str(obj)
Expand Down