internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-07 13:52:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make sensu_check compile on python 3 (#3177)

Browse Source
This commit is contained in:
Michael Scherer
2016-10-15 17:21:01 +02:00
committed by Matt Clay
parent 151c6d2f88
commit 415c2d4591
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/ansible/modules/extras/monitoring/sensu_check.py
View File

@@ -206,7 +206,8 @@ def sensu_check(module, path, name, state='present', backup=False):
try: try:
stream = open(path, 'r') stream = open(path, 'r')
config = json.load(stream) config = json.load(stream)
except IOError, e: except IOError:
e = get_exception()
if e.errno is 2: # File not found, non-fatal if e.errno is 2: # File not found, non-fatal
if state == 'absent': if state == 'absent':
reasons.append('file did not exist and state is `absent\'') reasons.append('file did not exist and state is `absent\'')
@@ -327,7 +328,8 @@ def sensu_check(module, path, name, state='present', backup=False):
try: try:
stream = open(path, 'w') stream = open(path, 'w')
stream.write(json.dumps(config, indent=2) + '\n') stream.write(json.dumps(config, indent=2) + '\n')
except IOError, e: except IOError:
e = get_exception()
module.fail_json(msg=str(e)) module.fail_json(msg=str(e))
finally: finally:
if stream: if stream:
@@ -381,4 +383,5 @@ def main():
module.exit_json(path=path, changed=changed, msg='OK', name=name, reasons=reasons) module.exit_json(path=path, changed=changed, msg='OK', name=name, reasons=reasons)
from ansible.module_utils.basic import * from ansible.module_utils.basic import *
from ansible.module_utils.pycompat24 import get_exception
main() main()

1
lib/ansible/modules/extras/test/utils/shippable/sanity-skip-python3.txt
View File

@@ -63,7 +63,6 @@
/monitoring/circonus_annotation.py /monitoring/circonus_annotation.py
/monitoring/datadog_monitor.py /monitoring/datadog_monitor.py
/monitoring/rollbar_deployment.py /monitoring/rollbar_deployment.py
/monitoring/sensu_check.py
/monitoring/stackdriver.py /monitoring/stackdriver.py
/monitoring/zabbix_group.py /monitoring/zabbix_group.py
/monitoring/zabbix_host.py /monitoring/zabbix_host.py