From: Frank Bryden Date: Wed, 3 Jun 2020 13:34:16 +0000 (+0000) Subject: Fix for Bug 1111 Reordering of format_out X-Git-Tag: release-v9.0-start~30 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=02e700c9eceb147f4c72c8fe18975bfaac6ec759;p=osm%2FNBI.git Fix for Bug 1111 Reordering of format_out Change-Id: I926cdb6fc877d5d4d233400f9eb9973ad6b2935d Signed-off-by: Frank Bryden --- diff --git a/osm_nbi/nbi.py b/osm_nbi/nbi.py index 6c63ad8..fd2b3e8 100644 --- a/osm_nbi/nbi.py +++ b/osm_nbi/nbi.py @@ -617,20 +617,14 @@ class Server(object): # TODO check that cherrypy close file. If not implement pending things to close per thread next return data if accept: - if "application/json" in accept: - cherrypy.response.headers["Content-Type"] = 'application/json; charset=utf-8' - a = json.dumps(data, indent=4) + "\n" - return a.encode("utf8") - elif "text/html" in accept: + if "text/html" in accept: return html.format(data, cherrypy.request, cherrypy.response, token_info) - elif "application/yaml" in accept or "*/*" in accept or "text/plain" in accept: pass - # if there is not any valid accept, raise an error. But if response is already an error, format in yaml - elif cherrypy.response.status >= 400: - raise cherrypy.HTTPError(HTTPStatus.NOT_ACCEPTABLE.value, - "Only 'Accept' of type 'application/json' or 'application/yaml' " - "for output format are available") + elif "application/json" in accept or (cherrypy.response.status and cherrypy.response.status >= 300): + cherrypy.response.headers["Content-Type"] = 'application/json; charset=utf-8' + a = json.dumps(data, indent=4) + "\n" + return a.encode("utf8") cherrypy.response.headers["Content-Type"] = 'application/yaml' return yaml.safe_dump(data, explicit_start=True, indent=4, default_flow_style=False, tags=False, encoding='utf-8', allow_unicode=True) # , canonical=True, default_style='"'