diff --git a/plugins/Owner/plugin.py b/plugins/Owner/plugin.py index 7230710ca..d2a67c099 100644 --- a/plugins/Owner/plugin.py +++ b/plugins/Owner/plugin.py @@ -203,10 +203,11 @@ class Owner(callbacks.Plugin): if irc != newIrc: newIrc.state.history = irc.state.history driver = drivers.newDriver(newIrc) + self._loadPlugins(newIrc) return newIrc - def do001(self, irc, msg): - self.log.info('Loading plugins (connected to %s).', irc.network) + def _loadPlugins(self, irc): + self.log.info('Loading plugins (connecting to %s).', irc.network) alwaysLoadImportant = conf.supybot.plugins.alwaysLoadImportant() important = conf.supybot.commands.defaultPlugins.importantPlugins() for (name, value) in conf.supybot.plugins.getValues(fullNames=False): diff --git a/scripts/supybot b/scripts/supybot index 976656bef..b0f8485e2 100644 --- a/scripts/supybot +++ b/scripts/supybot @@ -328,7 +328,7 @@ if __name__ == '__main__': import supybot.plugins.Owner as Owner owner = Owner.Class() - irclib._callbacks.append(owner) + #irclib._callbacks.append(owner) if options.profile: import profile diff --git a/src/irclib.py b/src/irclib.py index cf818ac8e..5f2695f5e 100644 --- a/src/irclib.py +++ b/src/irclib.py @@ -82,7 +82,8 @@ class IrcCallback(IrcCommandDispatcher): super(IrcCallback, self).__init__(*args, **kwargs) def __repr__(self): - return '<%s %s>' % (self.__class__.__name__, self.name()) + return '<%s %s %s>' % \ + (self.__class__.__name__, self.name(), object.__repr__(self)) def name(self): """Returns the name of the callback."""