diff options
| author | Abhijeet Kasurde <akasurde@redhat.com> | 2017-07-10 16:54:14 +0530 |
|---|---|---|
| committer | Toshio Kuratomi <a.badger@gmail.com> | 2017-08-02 06:51:38 -0700 |
| commit | 9803be2d4b5aac1c54991c9c501c2abc85c36b90 (patch) | |
| tree | 186ed076450c0dfdb4bbd0703ee166523788f09e | |
| parent | d85bc40a044eb7b1bf2fb603ad0fa75922de33ec (diff) | |
| download | ansible-9803be2d4b5aac1c54991c9c501c2abc85c36b90.tar.gz | |
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 <akasurde@redhat.com>
(cherry picked from commit b266204afa3722c77bd1d4d816f32b9ed7443685)
| -rw-r--r-- | lib/ansible/modules/cloud/digital_ocean/digital_ocean_tag.py | 5 |
1 files 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 |