GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2024-11-27 21:19:31 +01:00
Code Issues Projects Releases Wiki Activity

parse_message_args: remove extraneous \'s that aren't escaping characters

Browse Source
This commit is contained in:
James Lu 2019-09-10 18:30:43 -07:00
parent aba198dbd6
commit 943168df53
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
protocols/ircs2s_common.py
View File

@ -150,14 +150,18 @@ class IRCCommonProtocol(IRCNetwork):
if data[0].startswith('@'): if data[0].startswith('@'):
tagdata = data[0].lstrip('@').split(';') tagdata = data[0].lstrip('@').split(';')
for idx, tag in enumerate(tagdata): for idx, tag in enumerate(tagdata):
tag = tag.replace(r'\s', ' ') tag = tag.replace('\\s', ' ')
tag = tag.replace(r'\\', '\\') tag = tag.replace('\\r', '\r')
tag = tag.replace(r'\r', '\r') tag = tag.replace('\\n', '\n')
tag = tag.replace(r'\n', '\n') tag = tag.replace('\\:', ';')
tag = tag.replace(r'\:', ';')
# We want to drop lone \'s but keep \\ as \ ...
tag = tag.replace('\\\\', '\x00')
tag = tag.replace('\\', '')
tag = tag.replace('\x00', '\\')
tagdata[idx] = tag tagdata[idx] = tag
results = cls.parse_isupport(tagdata, fallback=None) results = cls.parse_isupport(tagdata, fallback='')
return results return results
return {} return {}

3
test/test_irc_parsers.py
View File

@ -46,7 +46,8 @@ class MessageParserTest(unittest.TestCase):
# method that relies on command handlers being present. So we can't reasonably test # method that relies on command handlers being present. So we can't reasonably test
# them here (plus handle_events() outputs params as a command-specific dict instead of) # them here (plus handle_events() outputs params as a command-specific dict instead of)
# lists) # lists)
self.assertEqual(atoms['tags'], IRCCommonProtocol.parse_message_tags(inp.split(" "))) self.assertEqual(atoms['tags'], IRCCommonProtocol.parse_message_tags(inp.split(" ")),
"Parse test failed for message tags: %r" % inp)
_, inp = inp.split(" ", 1) _, inp = inp.split(" ", 1)
if has_source: if has_source:
parts = IRCCommonProtocol.parse_prefixed_args(inp) parts = IRCCommonProtocol.parse_prefixed_args(inp)