a-c-m
/
community.general
mirror of https://github.com/ansible-collections/community.general.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cloudscale: improve error handling (#53054)

pull/4420/head
René Moser 2019-02-27 10:22:20 +01:00 committed by GitHub
parent 76e0e0080b
commit ca91ac2ca0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/ansible/module_utils/cloudscale.py
View File

@ -34,7 +34,7 @@ class AnsibleCloudscaleBase(object):
timeout=self._module.params['api_timeout']) timeout=self._module.params['api_timeout'])
if info['status'] == 200: if info['status'] == 200:
return self._module.from_json(to_text(resp.read())) return self._module.from_json(to_text(resp.read(), errors='surrogate_or_strict'))
elif info['status'] == 404: elif info['status'] == 404:
return None return None
else: else:
@ -55,7 +55,7 @@ class AnsibleCloudscaleBase(object):
timeout=self._module.params['api_timeout']) timeout=self._module.params['api_timeout'])
if info['status'] in (200, 201): if info['status'] in (200, 201):
return self._module.from_json(to_text(resp.read())) return self._module.from_json(to_text(resp.read(), errors='surrogate_or_strict'))
elif info['status'] == 204: elif info['status'] == 204:
return None return None
else: else: