cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

accept variants of returned json mime type (#33894)

Browse source
This commit is contained in:
Ted Timmons 2017-12-14 13:54:59 -08:00 committed by Matt Martz
parent ddc3465408
commit ff4eb94a04
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/modules/net_tools/basics/uri.py
View file

@ -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._text import to_native, to_text
from ansible.module_utils.urls import fetch_url, url_argument_spec from ansible.module_utils.urls import fetch_url, url_argument_spec
JSON_CANDIDATES = ('text', 'json', 'javascript')
def write_file(module, url, dest, content): def write_file(module, url, dest, content):
# create a tempfile with some test content # create a tempfile with some test content
@ -475,7 +477,7 @@ def main():
if 'charset' in params: if 'charset' in params:
content_encoding = params['charset'] content_encoding = params['charset']
u_content = to_text(content, encoding=content_encoding) 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: try:
js = json.loads(u_content) js = json.loads(u_content)
uresp['json'] = js uresp['json'] = js