]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/dashboard: controllers: fix endpoint return type when method returns `bytes`
authorRicardo Dias <rdias@suse.com>
Mon, 25 Jun 2018 09:30:25 +0000 (10:30 +0100)
committerRicardo Dias <rdias@suse.com>
Tue, 26 Jun 2018 11:28:55 +0000 (12:28 +0100)
Signed-off-by: Ricardo Dias <rdias@suse.com>
src/pybind/mgr/dashboard/controllers/__init__.py

index dfdb5fec57218e34d31a0f561993b9ab5d5cb9e4..c9016d47dfbf1986d15bf8a088e564eafd7910d2 100644 (file)
@@ -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')