From faf2608c83da13e2c46d7196e7b6023445a4be58 Mon Sep 17 00:00:00 2001 From: James McCoy Date: Tue, 6 Dec 2011 00:22:40 -0500 Subject: [PATCH] Bug fixes in src/ircmsgs.py unbans did send the repr() of the ban list, and IrcMsg.__hash__ did try to hash a list. Conflicts: src/version.py Signed-off-by: James McCoy (cherry picked from commit 998819da58aa79858d9d683c345d8dac0f49b721) Signed-off-by: Daniel Folkinshteyn --- src/ircmsgs.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/ircmsgs.py b/src/ircmsgs.py index d5f9fcaa1..b5e50b4e5 100644 --- a/src/ircmsgs.py +++ b/src/ircmsgs.py @@ -182,7 +182,7 @@ class IrcMsg(object): return self._hash self._hash = hash(self.command) ^ \ hash(self.prefix) ^ \ - hash(self.args) + hash(repr(self.args)) return self._hash def __repr__(self): @@ -522,7 +522,8 @@ def unbans(channel, hostmasks, prefix='', msg=None): if msg and not prefix: prefix = msg.prefix return IrcMsg(prefix=prefix, command='MODE', msg=msg, - args=(channel, '-' + ('b'*len(hostmasks)), hostmasks)) + args=(channel, '-' + ('b'*len(hostmasks)), + ' '.join(hostmasks))) def kick(channel, nick, s='', prefix='', msg=None): """Returns a KICK to kick nick from channel with the message msg."""