Mercurial > xib

diff irclib.py @ 236:8acbfda313b9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use ServerConnection.nickname instead of .real_nickname in most cases, make sure we put a string in .real_nickname Signed-off-by: Charly COSTE <changaco@changaco.net>
author Charly COSTE <changaco@changaco.net>
date Mon, 08 Mar 2010 10:32:50 +0100
parents c9c0d9a5e0b8
children e64b574afa8f
line wrap: on
line diff
--- a/irclib.py
+++ b/irclib.py
@@ -298,7 +298,7 @@ class IRC:
                 else:
                     self.bot.error(say_levels.error, 'Unkonwn exception on IRC thread:\n'+str(e.args))
                     continue
-                if c.real_nickname == self.bot.nickname:
+                if c.nickname == self.bot.nickname:
                     self.bot.restart(message='Lost bot IRC connection')
                 else:
                     c.disconnect(volontary=True)
@@ -780,8 +780,8 @@ class ServerConnection(Connection):
 
                 if command in ["nick", "welcome"]:
                     self.logged_in = True
-                    self.real_nickname = target
-                    if self.new_nickname:
+                    if self.new_nickname and isinstance(target, basestring):
+                        self.real_nickname = target
                         if self.new_nickname != target:
                             if len(self.new_nickname) > len(target):
                                 self._handle_event(Event('nicknametoolong', None, None, None))