From b266204afa3722c77bd1d4d816f32b9ed7443685 Mon Sep 17 00:00:00 2001
From: Abhijeet Kasurde <akasurde@redhat.com>
Date: Mon, 10 Jul 2017 16:54:14 +0530
Subject: [PATCH] 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>
---
.../modules/cloud/digital_ocean/digital_ocean_tag.py | 7 +++++--
1 file changed, 5 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 2b79c97830f..1198799138d 100644
--- a/lib/ansible/modules/cloud/digital_ocean/digital_ocean_tag.py
+++ b/lib/ansible/modules/cloud/digital_ocean/digital_ocean_tag.py
@@ -108,6 +108,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):
@@ -122,10 +123,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
@@ -213,6 +214,8 @@ def core(module):
# Check if resource is already tagged or not
found = False
url = "{0}?tag_name={1}".format(resource_type, name)
+ if resource_type == 'droplet':
+ url = "droplets?tag_name={0}".format(name)
response = rest.get(url)
status_code = response.status_code
resp_json = response.json