From 2cd657c9a9f0cd23bc871ccad2e519ca54d31e4c Mon Sep 17 00:00:00 2001 From: Jeremy Fincher Date: Sun, 5 Oct 2003 04:41:49 +0000 Subject: [PATCH] Made sure ChannelDBHandler is before callbacks.Privmsg* in the inheritance order so self.die() is ChannelDBHandler's and not callbacks.Privmsg*. --- plugins/ChannelDB.py | 2 +- plugins/Markov.py | 2 +- plugins/News.py | 2 +- plugins/URLSnarfer.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/ChannelDB.py b/plugins/ChannelDB.py index 070310032..9ce496d27 100644 --- a/plugins/ChannelDB.py +++ b/plugins/ChannelDB.py @@ -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) diff --git a/plugins/Markov.py b/plugins/Markov.py index 79aa14e9a..7faa75f45 100644 --- a/plugins/Markov.py +++ b/plugins/Markov.py @@ -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) diff --git a/plugins/News.py b/plugins/News.py index d346eafbf..081a3b6d8 100644 --- a/plugins/News.py +++ b/plugins/News.py @@ -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) diff --git a/plugins/URLSnarfer.py b/plugins/URLSnarfer.py index a7b04b8f2..dfb276e72 100644 --- a/plugins/URLSnarfer.py +++ b/plugins/URLSnarfer.py @@ -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)