Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2025-01-24 02:54:05 +01:00
Code Issues Projects Releases Wiki Activity

Only spaces are token separators, not all whitespaces.

Browse Source
This commit is contained in:
Valentin Lorentz 2020-05-01 23:44:38 +02:00
parent f4d5b866d9
commit e92156711b
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/ircmsgs.py
View File

@ -89,6 +89,10 @@ def format_server_tags(server_tags):
parts.append('%s=%s' % (key, escape_server_tag_value(value)))
return '@' + ';'.join(parts)
def split_args(s, maxsplit=-1):
"""Splits on spaces, treating consecutive spaces as one."""
return list(filter(bool, s.split(' ', maxsplit=maxsplit)))
class IrcMsg(object):
"""Class to represent an IRC message.
@ -144,16 +148,16 @@ class IrcMsg(object):
self.server_tags = parse_server_tags(server_tags[1:])
else:
self.server_tags = {}
if s[0] == ':':
self.prefix, s = s[1:].split(None, 1)
else:
self.prefix = ''
if ' :' in s: # Note the space: IPV6 addresses are bad w/o it.
s, last = s.split(' :', 1)
self.args = s.split()
self.args = split_args(s)
self.args.append(last.rstrip('\r\n'))
else:
self.args = s.split()
self.args = split_args(s.rstrip('\r\n'))
if self.args[0][0] == ':':
self.prefix = self.args.pop(0)[1:]
else:
self.prefix = ''
self.command = self.args.pop(0)
if 'time' in self.server_tags:
s = self.server_tags['time']

14
test/test_ircmsgs.py
View File

@ -119,6 +119,20 @@ class IrcMsgTestCase(SupyTestCase):
self.assertEqual(msg2.command, 'PRIVMSG')
self.assertEqual(msg2.args, msg.args)
def testSplit(self):
msg = ircmsgs.IrcMsg(s=':foo bar baz :qux')
self.assertEqual(msg.prefix, 'foo')
self.assertEqual(msg.command, 'bar')
self.assertEqual(msg.args, ('baz', 'qux'))
msg = ircmsgs.IrcMsg(s=':foo\tbar baz')
self.assertEqual(msg.prefix, 'foo\tbar')
self.assertEqual(msg.command, 'baz')
msg = ircmsgs.IrcMsg(s=':foo bar\tbaz')
self.assertEqual(msg.prefix, 'foo')
self.assertEqual(msg.command, 'bar\tbaz')
def testMalformedIrcMsgRaised(self):
self.assertRaises(ircmsgs.MalformedIrcMsg, ircmsgs.IrcMsg, ':foo')
self.assertRaises(ircmsgs.MalformedIrcMsg, ircmsgs.IrcMsg,