aboutsummaryrefslogtreecommitdiff
path: root/app/handlers/base.py
diff options
context:
space:
mode:
authorMilo Casagrande <milo.casagrande@linaro.org>2014-11-14 10:33:56 +0100
committerMilo Casagrande <milo.casagrande@linaro.org>2014-11-14 10:33:56 +0100
commit98becd655a434e68fe58cbdc5ded9b6636213c39 (patch)
tree8776fa62c86c9b108d524fe0cf5400bcc33d13e6 /app/handlers/base.py
parentc7e19ef695509dd7a80202bc665a886df54ab014 (diff)
Update json library, fix models.
Change-Id: I4f673d40870a0f2db260acca24adde8886c3f072
Diffstat (limited to 'app/handlers/base.py')
-rw-r--r--app/handlers/base.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/app/handlers/base.py b/app/handlers/base.py
index d8271a7..cd0d55c 100644
--- a/app/handlers/base.py
+++ b/app/handlers/base.py
@@ -13,9 +13,13 @@
"""The base RequestHandler that all subclasses should inherit from."""
+try:
+ import simplejson as json
+except ImportError:
+ import json
+
import functools
import httplib
-import json
import tornado
import tornado.web
@@ -126,7 +130,9 @@ class BaseHandler(tornado.web.RequestHandler):
status_code = response.status_code
reason = response.reason or self._get_status_message(status_code)
headers = response.headers
- result = json.dumps(response.to_dict(), default=default)
+ result = json.dumps(
+ response.to_dict(), default=default, ensure_ascii=False
+ )
else:
status_code = 506
reason = self._get_status_message(status_code)