From a19756ee7746a15f93597aafa97df01cf98e6922 Mon Sep 17 00:00:00 2001
From: Felix Fontein <felix@fontein.de>
Date: Mon, 13 Jul 2020 21:10:23 +0200
Subject: [PATCH] Fix acme_inspect problem with Python 3.5 (#87)

* Fix JSON loading problem with Python 3.5.

* Add changelog fragment.

* Enable 3.5 tests.
---
 changelogs/fragments/87-acme_inspect-python-3.5.yml | 2 ++
 plugins/modules/acme_inspect.py                     | 5 +++--
 shippable.yml                                       | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 changelogs/fragments/87-acme_inspect-python-3.5.yml

diff --git a/changelogs/fragments/87-acme_inspect-python-3.5.yml b/changelogs/fragments/87-acme_inspect-python-3.5.yml
new file mode 100644
index 00000000..73ee702e
--- /dev/null
+++ b/changelogs/fragments/87-acme_inspect-python-3.5.yml
@@ -0,0 +1,2 @@
+bugfixes:
+- "acme_inspect - fix problem with Python 3.5 that JSON was not decoded (https://github.com/ansible-collections/community.crypto/issues/86)."
diff --git a/plugins/modules/acme_inspect.py b/plugins/modules/acme_inspect.py
index eb7ca524..c22131c4 100644
--- a/plugins/modules/acme_inspect.py
+++ b/plugins/modules/acme_inspect.py
@@ -243,7 +243,7 @@ output_json:
 import json
 
 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils._text import to_native, to_bytes
+from ansible.module_utils._text import to_native, to_bytes, to_text
 
 from ansible_collections.community.crypto.plugins.module_utils.acme import (
     ModuleFailException,
@@ -299,7 +299,8 @@ def main():
             ))
             # See if we can parse the result as JSON
             try:
-                result['output_json'] = json.loads(data)
+                # to_text() is needed only for Python 3.5 (and potentially 3.0 to 3.4 as well)
+                result['output_json'] = json.loads(to_text(data))
             except Exception as dummy:
                 pass
             # Fail if error was returned
diff --git a/shippable.yml b/shippable.yml
index 393d6c1c..67e36f60 100644
--- a/shippable.yml
+++ b/shippable.yml
@@ -37,7 +37,7 @@ matrix:
 
     - env: T=devel/cloud/2.6/1
     - env: T=devel/cloud/2.7/1
-    # - env: T=devel/cloud/3.5/1
+    - env: T=devel/cloud/3.5/1
     - env: T=devel/cloud/3.6/1
     - env: T=devel/cloud/3.7/1
     - env: T=devel/cloud/3.8/1