mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Remove dict comprehension; use dict constructor
This commit is contained in:
parent
0a0ed538b2
commit
b24474ae58
1 changed files with 10 additions and 11 deletions
|
@ -155,7 +155,7 @@ except ImportError, e:
|
||||||
print("failed=True msg='pyrax is required for this module'")
|
print("failed=True msg='pyrax is required for this module'")
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
EXIT_DICT = {'success': True}
|
EXIT_DICT = dict(success=True)
|
||||||
META_PREFIX = 'x-container-meta-'
|
META_PREFIX = 'x-container-meta-'
|
||||||
USER_AGENT = "Ansible/%s via pyrax" % __version__
|
USER_AGENT = "Ansible/%s via pyrax" % __version__
|
||||||
|
|
||||||
|
@ -168,10 +168,11 @@ def _get_container(module, cf, container):
|
||||||
|
|
||||||
|
|
||||||
def _fetch_meta(module, container):
|
def _fetch_meta(module, container):
|
||||||
|
EXIT_DICT['meta'] = dict()
|
||||||
try:
|
try:
|
||||||
EXIT_DICT['meta'] = {
|
for k, v in container.get_metadata().items():
|
||||||
k.split(META_PREFIX)[-1]: v for k, v in container.get_metadata().items()
|
split_key = k.split(META_PREFIX)[-1]
|
||||||
}
|
EXIT_DICT['meta'][split_key] = v
|
||||||
except Exception, e:
|
except Exception, e:
|
||||||
module.fail_json(msg=e.message)
|
module.fail_json(msg=e.message)
|
||||||
|
|
||||||
|
@ -267,12 +268,10 @@ def container(cf, module, container_, state, meta_, clear_meta, ttl, public, pri
|
||||||
except Exception, e:
|
except Exception, e:
|
||||||
module.fail_json(msg=e.message)
|
module.fail_json(msg=e.message)
|
||||||
else:
|
else:
|
||||||
EXIT_DICT['container_urls'] = {
|
EXIT_DICT['container_urls'] = dict(url=c.cdn_uri,
|
||||||
'url': c.cdn_uri,
|
ssl_url=c.cdn_ssl_uri,
|
||||||
'ssl_url': c.cdn_ssl_uri,
|
streaming_url=c.cdn_streaming_uri,
|
||||||
'streaming_url': c.cdn_streaming_uri,
|
ios_uri=c.cdn_ios_uri)
|
||||||
'ios_uri': c.cdn_ios_uri
|
|
||||||
}
|
|
||||||
|
|
||||||
if private:
|
if private:
|
||||||
try:
|
try:
|
||||||
|
@ -337,7 +336,7 @@ def main():
|
||||||
dict(
|
dict(
|
||||||
container=dict(),
|
container=dict(),
|
||||||
state=dict(choices=['present', 'absent', 'list'], default='present'),
|
state=dict(choices=['present', 'absent', 'list'], default='present'),
|
||||||
meta=dict(type='dict', default={}),
|
meta=dict(type='dict', default=dict()),
|
||||||
clear_meta=dict(choices=BOOLEANS, default=False, type='bool'),
|
clear_meta=dict(choices=BOOLEANS, default=False, type='bool'),
|
||||||
type=dict(choices=['container', 'meta'], default='container'),
|
type=dict(choices=['container', 'meta'], default='container'),
|
||||||
ttl=dict(type='int'),
|
ttl=dict(type='int'),
|
||||||
|
|
Loading…
Reference in a new issue