ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-08-03 04:34:24 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Make jabber module compile on python 3

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

4
lib/ansible/modules/extras/notification/jabber.py
View file

@ -155,11 +155,13 @@ def main():
conn.send(msg) conn.send(msg)
time.sleep(1) time.sleep(1)
conn.disconnect() conn.disconnect()
except Exception, e: except Exception:
e = get_exception()
module.fail_json(msg="unable to send msg: %s" % e) module.fail_json(msg="unable to send msg: %s" % e)
module.exit_json(changed=False, to=to, user=user, msg=msg.getBody()) module.exit_json(changed=False, to=to, user=user, msg=msg.getBody())
# import module snippets # import module snippets
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

@ -58,4 +58,3 @@
/network/nmcli.py /network/nmcli.py
/network/openvswitch_bridge.py /network/openvswitch_bridge.py
/network/openvswitch_port.py /network/openvswitch_port.py
/notification/jabber.py