From: Ricardo Dias <rdias@suse.com>
Date: Mon, 25 Jun 2018 09:30:25 +0000 (+0100)
Subject: mgr/dashboard: controllers: fix endpoint return type when method returns `bytes`
X-Git-Tag: v14.0.1~1019^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9a49013287d9c7abfdb3cb7a3fd91aa140261f07;p=ceph.git

mgr/dashboard: controllers: fix endpoint return type when method returns `bytes`

Signed-off-by: Ricardo Dias <rdias@suse.com>
---

diff --git a/src/pybind/mgr/dashboard/controllers/__init__.py b/src/pybind/mgr/dashboard/controllers/__init__.py
index dfdb5fec5721..c9016d47dfbf 100644
--- a/src/pybind/mgr/dashboard/controllers/__init__.py
+++ b/src/pybind/mgr/dashboard/controllers/__init__.py
@@ -542,6 +542,8 @@ class BaseController(object):
                     kwargs.update(data.items())
                     ret = func(*args, **kwargs)
 
+            if isinstance(ret, bytes):
+                ret = ret.decode('utf-8')
             if json_response:
                 cherrypy.response.headers['Content-Type'] = 'application/json'
                 ret = json.dumps(ret).encode('utf8')