From 9803be2d4b5aac1c54991c9c501c2abc85c36b90 Mon Sep 17 00:00:00 2001 From: Abhijeet Kasurde Date: Mon, 10 Jul 2017 16:54:14 +0530 Subject: Fix JSON parsing for Python3 Fix corrects the parsing of JSON output in Python 3 environment by using to_text API. Fixes: #26489 Signed-off-by: Abhijeet Kasurde (cherry picked from commit b266204afa3722c77bd1d4d816f32b9ed7443685) --- lib/ansible/modules/cloud/digital_ocean/digital_ocean_tag.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/ansible/modules/cloud/digital_ocean/digital_ocean_tag.py b/lib/ansible/modules/cloud/digital_ocean/digital_ocean_tag.py index bae250ae1a..8ea89c9d42 100644 --- a/lib/ansible/modules/cloud/digital_ocean/digital_ocean_tag.py +++ b/lib/ansible/modules/cloud/digital_ocean/digital_ocean_tag.py @@ -115,6 +115,7 @@ import os from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.urls import fetch_url +from ansible.module_utils._text import to_text class Response(object): @@ -129,10 +130,10 @@ class Response(object): def json(self): if not self.body: if "body" in self.info: - return json.loads(self.info["body"]) + return json.loads(to_text(self.info["body"], errors='surrogate_or_strict')) return None try: - return json.loads(self.body) + return json.loads(to_text(self.body, errors='surrogate_or_strict')) except ValueError: return None -- cgit v1.2.1