Make sure json response is encoded to utf-8

This commit is contained in:
JonnyWong16 2020-08-03 21:45:11 -07:00
parent f7153d0f3b
commit 3d35a525d3
No known key found for this signature in database
GPG key ID: B1F1F9807184697A

View file

@ -1,4 +1,4 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# This file is part of Tautulli. # This file is part of Tautulli.
# #
@ -5923,8 +5923,9 @@ class WebInterface(object):
if args and 'v2' in args[0]: if args and 'v2' in args[0]:
return API2()._api_run(**kwargs) return API2()._api_run(**kwargs)
else: else:
cherrypy.response.headers['Content-Type'] = 'application/json;charset=UTF-8'
return json.dumps(API2()._api_responds(result_type='error', return json.dumps(API2()._api_responds(result_type='error',
msg='Please use the /api/v2 endpoint.')) msg='Please use the /api/v2 endpoint.')).encode('utf-8')
@cherrypy.expose @cherrypy.expose
@cherrypy.tools.json_out() @cherrypy.tools.json_out()
@ -6327,7 +6328,7 @@ class WebInterface(object):
if raw: if raw:
cherrypy.response.headers['Content-Type'] = 'application/json;charset=UTF-8' cherrypy.response.headers['Content-Type'] = 'application/json;charset=UTF-8'
return json.dumps(newsletter_agent.raw_data(preview=preview)) return json.dumps(newsletter_agent.raw_data(preview=preview)).encode('utf-8')
return newsletter_agent.generate_newsletter(preview=preview) return newsletter_agent.generate_newsletter(preview=preview)