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

cloudscale: fix compatibilty with older py3 versions (#52822)

Browse source 
* cloudscale: fix compatibilty with older py3 versions

* add doc fragment
This commit is contained in:
René Moser 2019-02-24 20:04:34 +01:00 committed by GitHub
parent 7bca6a56c9
commit ee416fd01d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/52822-cloudscale_fix-py3.yaml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- cloudscale - Fix compatibilty with Python3 in version 3.5 and lower.

7
lib/ansible/module_utils/cloudscale.py
View file

@ -6,10 +6,9 @@
from __future__ import absolute_import, division, print_function
__metaclass__ = type
import json
from ansible.module_utils.basic import env_fallback
from ansible.module_utils.urls import fetch_url
from ansible.module_utils._text import to_text
API_URL = 'https://api.cloudscale.ch/v1/'
@ -35,7 +34,7 @@ class AnsibleCloudscaleBase(object):
timeout=self._module.params['api_timeout'])
if info['status'] == 200:
return json.loads(resp.read())
return self._module.from_json(to_text(resp.read()))
elif info['status'] == 404:
return None
else:
@ -56,7 +55,7 @@ class AnsibleCloudscaleBase(object):
timeout=self._module.params['api_timeout'])
if info['status'] in (200, 201):
return json.loads(resp.read())
return self._module.from_json(to_text(resp.read()))
elif info['status'] == 204:
return None
else: