wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make irc.py compile on python3

Browse source
This commit is contained in:
Michael Scherer 2016-10-14 00:18:02 +02:00 committed by Matt Clay
parent 1f406d4530
commit 9aec480f59
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/notification/irc.py
View file

@ -289,7 +289,8 @@ def main():
try: try:
send_msg(msg, server, port, channel, nick_to, key, topic, nick, color, passwd, timeout, use_ssl, part, style) send_msg(msg, server, port, channel, nick_to, key, topic, nick, color, passwd, timeout, use_ssl, part, style)
except Exception, e: except Exception:
e = get_exception()
module.fail_json(msg="unable to send to IRC: %s" % e) module.fail_json(msg="unable to send to IRC: %s" % e)
module.exit_json(changed=False, channel=channel, nick=nick, module.exit_json(changed=False, channel=channel, nick=nick,
@ -297,4 +298,5 @@ def main():
# 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

@ -78,7 +78,6 @@
/network/nmcli.py /network/nmcli.py
/network/openvswitch_bridge.py /network/openvswitch_bridge.py
/network/openvswitch_port.py /network/openvswitch_port.py
/notification/irc.py
/notification/jabber.py /notification/jabber.py
/notification/mail.py /notification/mail.py
/notification/mqtt.py /notification/mqtt.py