From ff4eb94a049e9141a04723a8dedca210121d6540 Mon Sep 17 00:00:00 2001 From: Ted Timmons Date: Thu, 14 Dec 2017 13:54:59 -0800 Subject: [PATCH] accept variants of returned json mime type (#33894) --- lib/ansible/modules/net_tools/basics/uri.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/ansible/modules/net_tools/basics/uri.py b/lib/ansible/modules/net_tools/basics/uri.py index b5d7c22aa4c..3f184051858 100644 --- a/lib/ansible/modules/net_tools/basics/uri.py +++ b/lib/ansible/modules/net_tools/basics/uri.py @@ -236,6 +236,8 @@ import ansible.module_utils.six as six from ansible.module_utils._text import to_native, to_text from ansible.module_utils.urls import fetch_url, url_argument_spec +JSON_CANDIDATES = ('text', 'json', 'javascript') + def write_file(module, url, dest, content): # create a tempfile with some test content @@ -475,7 +477,7 @@ def main(): if 'charset' in params: content_encoding = params['charset'] u_content = to_text(content, encoding=content_encoding) - if 'application/json' in content_type or 'text/json' in content_type: + if any(candidate in content_type for candidate in JSON_CANDIDATES): try: js = json.loads(u_content) uresp['json'] = js