aboutsummaryrefslogtreecommitdiff
path: root/ihatemoney/run.py
diff options
context:
space:
mode:
authorAlexis Métaireau <alexis@vieuxsinge.com>2018-08-05 14:37:50 +0200
committerAlexis Métaireau <alexis@vieuxsinge.com>2018-08-05 14:37:50 +0200
commit633e3543b24fb241135770afe0ca8bcd8ceae072 (patch)
tree33d5183816de8365efb94645b526b5a052d9e28c /ihatemoney/run.py
parentc3b973b15e888263f6ca8538a72e39280a77ac3e (diff)
parent08bcf702b86d520b15cd8e9acee3b8df1fe9d07b (diff)
downloadihatemoney-mirror-633e3543b24fb241135770afe0ca8bcd8ceae072.zip
ihatemoney-mirror-633e3543b24fb241135770afe0ca8bcd8ceae072.tar.gz
ihatemoney-mirror-633e3543b24fb241135770afe0ca8bcd8ceae072.tar.bz2
Merge branch 'master' into almet/fix-pbkdf2-check
Diffstat (limited to 'ihatemoney/run.py')
-rw-r--r--ihatemoney/run.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/ihatemoney/run.py b/ihatemoney/run.py
index b431cb4..6dac233 100644
--- a/ihatemoney/run.py
+++ b/ihatemoney/run.py
@@ -11,7 +11,7 @@ from werkzeug.contrib.fixers import ProxyFix
from ihatemoney.api import api
from ihatemoney.models import db
-from ihatemoney.utils import PrefixedWSGI, minimal_round
+from ihatemoney.utils import PrefixedWSGI, minimal_round, IhmJSONEncoder
from ihatemoney.web import main as web_interface
from ihatemoney import default_settings
@@ -68,6 +68,8 @@ def load_configuration(app, configuration=None):
app.config.from_pyfile(env_var_config)
else:
app.config.from_pyfile('ihatemoney.cfg', silent=True)
+ # Configure custom JSONEncoder used by the API
+ app.config['RESTFUL_JSON'] = {'cls': IhmJSONEncoder}
def validate_configuration(app):