cloudscale: fix compatibilty with older py3 versions (#52822)
* cloudscale: fix compatibilty with older py3 versions * add doc fragmentpull/4420/head
parent
7bca6a56c9
commit
ee416fd01d
|
@ -0,0 +1,2 @@
|
||||||
|
bugfixes:
|
||||||
|
- cloudscale - Fix compatibilty with Python3 in version 3.5 and lower.
|
|
@ -6,10 +6,9 @@
|
||||||
from __future__ import absolute_import, division, print_function
|
from __future__ import absolute_import, division, print_function
|
||||||
__metaclass__ = type
|
__metaclass__ = type
|
||||||
|
|
||||||
import json
|
|
||||||
|
|
||||||
from ansible.module_utils.basic import env_fallback
|
from ansible.module_utils.basic import env_fallback
|
||||||
from ansible.module_utils.urls import fetch_url
|
from ansible.module_utils.urls import fetch_url
|
||||||
|
from ansible.module_utils._text import to_text
|
||||||
|
|
||||||
API_URL = 'https://api.cloudscale.ch/v1/'
|
API_URL = 'https://api.cloudscale.ch/v1/'
|
||||||
|
|
||||||
|
@ -35,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 json.loads(resp.read())
|
return self._module.from_json(to_text(resp.read()))
|
||||||
elif info['status'] == 404:
|
elif info['status'] == 404:
|
||||||
return None
|
return None
|
||||||
else:
|
else:
|
||||||
|
@ -56,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 json.loads(resp.read())
|
return self._module.from_json(to_text(resp.read()))
|
||||||
elif info['status'] == 204:
|
elif info['status'] == 204:
|
||||||
return None
|
return None
|
||||||
else:
|
else:
|
||||||
|
|
Loading…
Reference in New Issue