From a34589cce72d2163dab1ee6b5ff79f8712ef23e6 Mon Sep 17 00:00:00 2001 From: Jeremy Fincher Date: Tue, 28 Oct 2003 06:30:42 +0000 Subject: [PATCH] Completed the removal of callbacks.Privmsg.doPrivmsg. --- plugins/Markov.py | 3 +-- plugins/Notes.py | 2 -- plugins/Relay.py | 1 - plugins/URLSnarfer.py | 1 - src/callbacks.py | 3 --- 5 files changed, 1 insertion(+), 9 deletions(-) diff --git a/plugins/Markov.py b/plugins/Markov.py index 4cac13af6..52e557465 100644 --- a/plugins/Markov.py +++ b/plugins/Markov.py @@ -85,7 +85,7 @@ class Markov(plugins.ChannelDBHandler, callbacks.Privmsg): def doPrivmsg(self, irc, msg): if not ircutils.isChannel(msg.args[0]): - return callbacks.Privmsg.doPrivmsg(self, irc, msg) + return channel = msg.args[0] db = self.getDb(channel) cursor = db.cursor() @@ -116,7 +116,6 @@ class Markov(plugins.ChannelDBHandler, callbacks.Privmsg): id = int(cursor.fetchone()[0]) cursor.execute("INSERT INTO follows VALUES (NULL, %s, NULL)", id) db.commit() - return callbacks.Privmsg.doPrivmsg(self, irc, msg) _maxMarkovLength = 80 _minMarkovLength = 7 diff --git a/plugins/Notes.py b/plugins/Notes.py index 311fc837c..288c6e763 100644 --- a/plugins/Notes.py +++ b/plugins/Notes.py @@ -113,7 +113,6 @@ class Notes(callbacks.Privmsg): try: id = ircdb.users.getUserId(msg.prefix) except KeyError: - callbacks.Privmsg.doPrivmsg(self, irc, msg) return cursor = self.db.cursor() cursor.execute("""SELECT COUNT(*) FROM notes @@ -130,7 +129,6 @@ class Notes(callbacks.Privmsg): cursor.execute("""UPDATE notes SET notified=1 WHERE notes.to_id=%s""", id) self.db.commit() - callbacks.Privmsg.doPrivmsg(self, irc, msg) def sendnote(self, irc, msg, args): """ diff --git a/plugins/Relay.py b/plugins/Relay.py index 215f0ea08..a156d3a9e 100644 --- a/plugins/Relay.py +++ b/plugins/Relay.py @@ -461,7 +461,6 @@ class Relay(callbacks.Privmsg): otherIrc.queueMsg(msg) def doPrivmsg(self, irc, msg): - callbacks.Privmsg.doPrivmsg(self, irc, msg) if not isinstance(irc, irclib.Irc): irc = irc.getRealIrc() if self.started and ircutils.isChannel(msg.args[0]): diff --git a/plugins/URLSnarfer.py b/plugins/URLSnarfer.py index d4351e39b..c5313e6f0 100644 --- a/plugins/URLSnarfer.py +++ b/plugins/URLSnarfer.py @@ -108,7 +108,6 @@ class URLSnarfer(plugins.ChannelDBHandler, callbacks.Privmsg): _urlRe = re.compile(r"([^\[<(\s]+://[^\])>\s]+)", re.I) def doPrivmsg(self, irc, msg): - callbacks.Privmsg.doPrivmsg(self, irc, msg) channel = msg.args[0] db = self.getDb(channel) cursor = db.cursor() diff --git a/src/callbacks.py b/src/callbacks.py index 4c75a7088..24f751647 100644 --- a/src/callbacks.py +++ b/src/callbacks.py @@ -714,9 +714,6 @@ class Privmsg(irclib.IrcCallback): funcname = '%s.%s' % (f.im_class.__name__, f.im_func.func_name) debug.msg('%s took %s seconds' % (funcname, elapsed), 'verbose') - def doPrivmsg(self, irc, msg, rateLimit=True): - pass - class IrcObjectProxyRegexp: def __init__(self, irc, *args):