ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

fix irc module to work with py3 (#42267)

Browse source 
* fix irc module to work with py3

fixes #42256
This commit is contained in:
Brian Coca 2018-07-10 09:42:14 -04:00 committed by GitHub
parent 4a7940c562
commit 1c08eb8b27
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/irc_py3_compat.yaml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- made irc module python3 compatible https://github.com/ansible/ansible/issues/42256

31
lib/ansible/modules/notification/irc.py
View file

@ -133,8 +133,8 @@ import ssl
import time import time
import traceback import traceback
from ansible.module_utils._text import to_native, to_bytes
from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils._text import to_native
def send_msg(msg, server='localhost', port='6667', channel=None, nick_to=None, key=None, topic=None, def send_msg(msg, server='localhost', port='6667', channel=None, nick_to=None, key=None, topic=None,
@ -170,13 +170,13 @@ def send_msg(msg, server='localhost', port='6667', channel=None, nick_to=None, k
try: try:
styletext = stylechoices[style] styletext = stylechoices[style]
except: except Exception:
styletext = "" styletext = ""
try: try:
colornumber = colornumbers[color] colornumber = colornumbers[color]
colortext = "\x03" + colornumber colortext = "\x03" + colornumber
except: except Exception:
colortext = "" colortext = ""
message = styletext + colortext + msg message = styletext + colortext + msg
@ -185,14 +185,15 @@ def send_msg(msg, server='localhost', port='6667', channel=None, nick_to=None, k
if use_ssl: if use_ssl:
irc = ssl.wrap_socket(irc) irc = ssl.wrap_socket(irc)
irc.connect((server, int(port))) irc.connect((server, int(port)))
if passwd: if passwd:
irc.send('PASS %s\r\n' % passwd) irc.send(to_bytes('PASS %s\r\n' % passwd))
irc.send('NICK %s\r\n' % nick) irc.send(to_bytes('NICK %s\r\n' % nick))
irc.send('USER %s %s %s :ansible IRC\r\n' % (nick, nick, nick)) irc.send(to_bytes('USER %s %s %s :ansible IRC\r\n' % (nick, nick, nick)))
motd = '' motd = ''
start = time.time() start = time.time()
while 1: while 1:
motd += irc.recv(1024) motd += to_native(irc.recv(1024))
# The server might send back a shorter nick than we specified (due to NICKLEN), # The server might send back a shorter nick than we specified (due to NICKLEN),
# so grab that and use it from now on (assuming we find the 00[1-4] response). # so grab that and use it from now on (assuming we find the 00[1-4] response).
match = re.search(r'^:\S+ 00[1-4] (?P<nick>\S+) :', motd, flags=re.M) match = re.search(r'^:\S+ 00[1-4] (?P<nick>\S+) :', motd, flags=re.M)
@ -204,14 +205,14 @@ def send_msg(msg, server='localhost', port='6667', channel=None, nick_to=None, k
time.sleep(0.5) time.sleep(0.5)
if key: if key:
irc.send('JOIN %s %s\r\n' % (channel, key)) irc.send(to_bytes('JOIN %s %s\r\n' % (channel, key)))
else: else:
irc.send('JOIN %s\r\n' % channel) irc.send(to_bytes('JOIN %s\r\n' % channel))
join = '' join = ''
start = time.time() start = time.time()
while 1: while 1:
join += irc.recv(1024) join += to_native(irc.recv(1024))
if re.search(r'^:\S+ 366 %s %s :' % (nick, channel), join, flags=re.M): if re.search(r'^:\S+ 366 %s %s :' % (nick, channel), join, flags=re.M):
break break
elif time.time() - start > timeout: elif time.time() - start > timeout:
@ -219,18 +220,18 @@ def send_msg(msg, server='localhost', port='6667', channel=None, nick_to=None, k
time.sleep(0.5) time.sleep(0.5)
if topic is not None: if topic is not None:
irc.send('TOPIC %s :%s\r\n' % (channel, topic)) irc.send(to_bytes('TOPIC %s :%s\r\n' % (channel, topic)))
time.sleep(1) time.sleep(1)
if nick_to: if nick_to:
for nick in nick_to: for nick in nick_to:
irc.send('PRIVMSG %s :%s\r\n' % (nick, message)) irc.send(to_bytes('PRIVMSG %s :%s\r\n' % (nick, message)))
if channel: if channel:
irc.send('PRIVMSG %s :%s\r\n' % (channel, message)) irc.send(to_bytes('PRIVMSG %s :%s\r\n' % (channel, message)))
time.sleep(1) time.sleep(1)
if part: if part:
irc.send('PART %s\r\n' % channel) irc.send(to_bytes('PART %s\r\n' % channel))
irc.send('QUIT\r\n') irc.send(to_bytes('QUIT\r\n'))
time.sleep(1) time.sleep(1)
irc.close() irc.close()