mirror of
https://github.com/Mikaela/Limnoria.git
synced 2025-01-30 14:14:37 +01:00
Made sure ChannelDBHandler is before callbacks.Privmsg* in the inheritance order so self.die() is ChannelDBHandler's and not callbacks.Privmsg*.
This commit is contained in:
parent
151657f40d
commit
2cd657c9a9
@ -75,7 +75,7 @@ frowns = (':|', ':-/', ':-\\', ':\\', ':/', ':(', ':-(', ':\'(')
|
||||
smileyre = re.compile('|'.join(map(re.escape, smileys)))
|
||||
frownre = re.compile('|'.join(map(re.escape, frowns)))
|
||||
|
||||
class ChannelDB(callbacks.PrivmsgCommandAndRegexp, ChannelDBHandler):
|
||||
class ChannelDB(ChannelDBHandler, callbacks.PrivmsgCommandAndRegexp):
|
||||
regexps = sets.Set(['increaseKarma', 'decreaseKarma'])
|
||||
def __init__(self):
|
||||
ChannelDBHandler.__init__(self)
|
||||
|
@ -57,7 +57,7 @@ def configure(onStart, afterConnect, advanced):
|
||||
from questions import expect, anything, something, yn
|
||||
onStart.append('load Markov')
|
||||
|
||||
class Markov(callbacks.Privmsg, ChannelDBHandler):
|
||||
class Markov(ChannelDBHandler, callbacks.Privmsg):
|
||||
threaded = True
|
||||
def __init__(self):
|
||||
ChannelDBHandler.__init__(self)
|
||||
|
@ -77,7 +77,7 @@ be a lot more detailed. (Subject: "Another test news item", added by Strike on
|
||||
07:12 PM, September 12, 2003, expires at 08:36 PM, September 12, 2003)
|
||||
""")
|
||||
|
||||
class News(callbacks.Privmsg, ChannelDBHandler):
|
||||
class News(ChannelDBHandler, callbacks.Privmsg):
|
||||
def __init__(self):
|
||||
ChannelDBHandler.__init__(self)
|
||||
callbacks.Privmsg.__init__(self)
|
||||
|
@ -80,7 +80,7 @@ def configure(onStart, afterConnect, advanced):
|
||||
from questions import expect, anything, something, yn
|
||||
onStart.append('load URLSnarfer')
|
||||
|
||||
class URLSnarfer(callbacks.Privmsg, ChannelDBHandler):
|
||||
class URLSnarfer(ChannelDBHandler, callbacks.Privmsg):
|
||||
def __init__(self):
|
||||
self.nextMsgs = {}
|
||||
callbacks.Privmsg.__init__(self)
|
||||
|
Loading…
Reference in New Issue
Block a user