From e6dd2a63c1f1c2f1ed56e98c6df0aadb6e7afc9f Mon Sep 17 00:00:00 2001 From: Sandy Carter Date: Mon, 22 Sep 2014 12:21:09 -0400 Subject: [PATCH] Fix two possible AsciiErrors when an exception occurs Signed-off-by: Sandy Carter --- openerp/http.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/openerp/http.py b/openerp/http.py index 10e44c08fc5..a70a9f1e852 100644 --- a/openerp/http.py +++ b/openerp/http.py @@ -41,6 +41,7 @@ import openerp from openerp import SUPERUSER_ID from openerp.service import security, model as service_model from openerp.tools.func import lazy_property +from openerp.tools import ustr _logger = logging.getLogger(__name__) @@ -522,7 +523,7 @@ def serialize_exception(e): tmp = { "name": type(e).__module__ + "." + type(e).__name__ if type(e).__module__ else type(e).__name__, "debug": traceback.format_exc(), - "message": u"%s" % e, + "message": ustr(e), "arguments": to_jsonable(e.args), } if isinstance(e, openerp.osv.osv.except_osv): @@ -546,7 +547,7 @@ def to_jsonable(o): for k, v in o.items(): tmp[u"%s" % k] = to_jsonable(v) return tmp - return u"%s" % o + return ustr(o) def jsonrequest(f): """