From c74e8f35abfe511ae85feac47ed90e4df5a513fa Mon Sep 17 00:00:00 2001 From: James McCoy Date: Sun, 26 Aug 2012 12:59:41 -0400 Subject: [PATCH] Fix regression in parsing 004 messages This was introduced in commit 4232e40e262cbbdb675b1cf315c43f576d8b1f43 Signed-off-by: James McCoy --- src/irclib.py | 6 +++--- test/test_irclib.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/irclib.py b/src/irclib.py index c4292e880..062b6ecc7 100644 --- a/src/irclib.py +++ b/src/irclib.py @@ -404,10 +404,10 @@ class IrcState(IrcCommandDispatcher): """Handles parsing the 004 reply Supported user and channel modes are cached""" - # msg.args = [server, ircd-version, umodes, modes, + # msg.args = [nick, server, ircd-version, umodes, modes, # modes that require arguments? (non-standard)] - self.supported['umodes'] = msg.args[2] - self.supported['chanmodes'] = msg.args[3] + self.supported['umodes'] = msg.args[3] + self.supported['chanmodes'] = msg.args[4] _005converters = utils.InsensitivePreservingDict({ 'modes': int, diff --git a/test/test_irclib.py b/test/test_irclib.py index bda696be6..b9799e3a3 100644 --- a/test/test_irclib.py +++ b/test/test_irclib.py @@ -292,7 +292,7 @@ class IrcStateTestCase(SupyTestCase): def testSupportedUmodes(self): state = irclib.IrcState() - state.addMsg(self.irc, ircmsgs.IrcMsg(':charm.oftc.net 004 charm.oftc.net hybrid-7.2.2+oftc1.6.8 CDGPRSabcdfgiklnorsuwxyz biklmnopstveI bkloveI')) + state.addMsg(self.irc, ircmsgs.IrcMsg(':coulomb.oftc.net 004 testnick coulomb.oftc.net hybrid-7.2.2+oftc1.6.8 CDGPRSabcdfgiklnorsuwxyz biklmnopstveI bkloveI')) self.assertEqual(state.supported['umodes'], 'CDGPRSabcdfgiklnorsuwxyz') self.assertEqual(state.supported['chanmodes'], 'biklmnopstveI')