From 3d35a525d31b4959002815400834b9605c283410 Mon Sep 17 00:00:00 2001 From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com> Date: Mon, 3 Aug 2020 21:45:11 -0700 Subject: [PATCH] Make sure json response is encoded to utf-8 --- plexpy/webserve.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/plexpy/webserve.py b/plexpy/webserve.py index 373f4a92..4cdf31ae 100644 --- a/plexpy/webserve.py +++ b/plexpy/webserve.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# -*- coding: utf-8 -*- # This file is part of Tautulli. # @@ -5923,8 +5923,9 @@ class WebInterface(object): if args and 'v2' in args[0]: return API2()._api_run(**kwargs) else: + cherrypy.response.headers['Content-Type'] = 'application/json;charset=UTF-8' 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.tools.json_out() @@ -6327,7 +6328,7 @@ class WebInterface(object): if raw: 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)