diff --git a/src/drivers/Socket.py b/src/drivers/Socket.py index 512f9dd54..86c6d6ada 100644 --- a/src/drivers/Socket.py +++ b/src/drivers/Socket.py @@ -48,8 +48,8 @@ from supybot.utils.iter import imap class SocketDriver(drivers.IrcDriver, drivers.ServersMixin): def __init__(self, irc): self.irc = irc - self.__parent = super(SocketDriver, self) - self.__parent.__init__(irc) + drivers.IrcDriver.__init__(self, irc) + drivers.ServersMixin.__init__(self, irc) self.conn = None self.servers = () self.eagains = 0 @@ -77,7 +77,7 @@ class SocketDriver(drivers.IrcDriver, drivers.ServersMixin): def _getNextServer(self): oldServer = getattr(self, 'currentServer', None) - server = self.__parent._getNextServer() + server = drivers.ServersMixin._getNextServer(self) if self.currentServer != oldServer: self.resetDelay() return server diff --git a/src/drivers/__init__.py b/src/drivers/__init__.py index 923ad1bea..333ec8258 100644 --- a/src/drivers/__init__.py +++ b/src/drivers/__init__.py @@ -49,7 +49,7 @@ class IrcDriver(object): """Base class for drivers.""" def __init__(self, *args, **kwargs): add(self.name(), self) - super(IrcDriver, self).__init__() + super(IrcDriver, self).__init__(*args, **kwargs) def run(self): raise NotImplementedError