Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2025-02-17 06:00:42 +01:00
Code Issues Projects Releases Wiki Activity

Re-fix IrcDriver, which actually does need the args to __init__

Browse Source
This commit is contained in:
James Vega 2009-01-28 05:31:45 +00:00
parent feeded6135
commit 10342acd11
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/drivers/Socket.py
View File

@ -48,8 +48,8 @@ from supybot.utils.iter import imap
class SocketDriver(drivers.IrcDriver, drivers.ServersMixin): class SocketDriver(drivers.IrcDriver, drivers.ServersMixin):
def __init__(self, irc): def __init__(self, irc):
self.irc = irc self.irc = irc
self.__parent = super(SocketDriver, self) drivers.IrcDriver.__init__(self, irc)
self.__parent.__init__(irc) drivers.ServersMixin.__init__(self, irc)
self.conn = None self.conn = None
self.servers = () self.servers = ()
self.eagains = 0 self.eagains = 0
@ -77,7 +77,7 @@ class SocketDriver(drivers.IrcDriver, drivers.ServersMixin):
def _getNextServer(self): def _getNextServer(self):
oldServer = getattr(self, 'currentServer', None) oldServer = getattr(self, 'currentServer', None)
server = self.__parent._getNextServer() server = drivers.ServersMixin._getNextServer(self)
if self.currentServer != oldServer: if self.currentServer != oldServer:
self.resetDelay() self.resetDelay()
return server return server

2
src/drivers/__init__.py
View File

@ -49,7 +49,7 @@ class IrcDriver(object):
"""Base class for drivers.""" """Base class for drivers."""
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
add(self.name(), self) add(self.name(), self)
super(IrcDriver, self).__init__() super(IrcDriver, self).__init__(*args, **kwargs)
def run(self): def run(self):
raise NotImplementedError raise NotImplementedError