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

Make bigpanda module pass python3 sanity check

Browse source
This commit is contained in:
Michael Scherer 2016-10-17 15:36:09 +02:00 committed by Matt Clay
parent 9cac0b54c6
commit d4157095f3
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/modules/extras/monitoring/bigpanda.py
View file

@ -170,11 +170,13 @@ def main():
module.exit_json(changed=True, **deployment) module.exit_json(changed=True, **deployment)
else: else:
module.fail_json(msg=json.dumps(info)) module.fail_json(msg=json.dumps(info))
except Exception, e: except Exception:
e = get_exception()
module.fail_json(msg=str(e)) module.fail_json(msg=str(e))
# import module snippets # import module snippets
from ansible.module_utils.basic import * from ansible.module_utils.basic import *
from ansible.module_utils.urls import * from ansible.module_utils.urls import *
from ansible.module_utils.pycompat24 import get_exception
if __name__ == '__main__': if __name__ == '__main__':
main() main()

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

@ -45,7 +45,6 @@
/database/vertica/vertica_role.py /database/vertica/vertica_role.py
/database/vertica/vertica_schema.py /database/vertica/vertica_schema.py
/database/vertica/vertica_user.py /database/vertica/vertica_user.py
/monitoring/bigpanda.py
/monitoring/boundary_meter.py /monitoring/boundary_meter.py
/monitoring/circonus_annotation.py /monitoring/circonus_annotation.py
/monitoring/datadog_monitor.py /monitoring/datadog_monitor.py