Completed the removal of callbacks.Privmsg.doPrivmsg.

This commit is contained in:
Jeremy Fincher 2003-10-28 06:30:42 +00:00
parent b5f7bec137
commit a34589cce7
5 changed files with 1 additions and 9 deletions

View File

@ -85,7 +85,7 @@ class Markov(plugins.ChannelDBHandler, callbacks.Privmsg):
def doPrivmsg(self, irc, msg): def doPrivmsg(self, irc, msg):
if not ircutils.isChannel(msg.args[0]): if not ircutils.isChannel(msg.args[0]):
return callbacks.Privmsg.doPrivmsg(self, irc, msg) return
channel = msg.args[0] channel = msg.args[0]
db = self.getDb(channel) db = self.getDb(channel)
cursor = db.cursor() cursor = db.cursor()
@ -116,7 +116,6 @@ class Markov(plugins.ChannelDBHandler, callbacks.Privmsg):
id = int(cursor.fetchone()[0]) id = int(cursor.fetchone()[0])
cursor.execute("INSERT INTO follows VALUES (NULL, %s, NULL)", id) cursor.execute("INSERT INTO follows VALUES (NULL, %s, NULL)", id)
db.commit() db.commit()
return callbacks.Privmsg.doPrivmsg(self, irc, msg)
_maxMarkovLength = 80 _maxMarkovLength = 80
_minMarkovLength = 7 _minMarkovLength = 7

View File

@ -113,7 +113,6 @@ class Notes(callbacks.Privmsg):
try: try:
id = ircdb.users.getUserId(msg.prefix) id = ircdb.users.getUserId(msg.prefix)
except KeyError: except KeyError:
callbacks.Privmsg.doPrivmsg(self, irc, msg)
return return
cursor = self.db.cursor() cursor = self.db.cursor()
cursor.execute("""SELECT COUNT(*) FROM notes cursor.execute("""SELECT COUNT(*) FROM notes
@ -130,7 +129,6 @@ class Notes(callbacks.Privmsg):
cursor.execute("""UPDATE notes SET notified=1 cursor.execute("""UPDATE notes SET notified=1
WHERE notes.to_id=%s""", id) WHERE notes.to_id=%s""", id)
self.db.commit() self.db.commit()
callbacks.Privmsg.doPrivmsg(self, irc, msg)
def sendnote(self, irc, msg, args): def sendnote(self, irc, msg, args):
"""<recipient> <text> """<recipient> <text>

View File

@ -461,7 +461,6 @@ class Relay(callbacks.Privmsg):
otherIrc.queueMsg(msg) otherIrc.queueMsg(msg)
def doPrivmsg(self, irc, msg): def doPrivmsg(self, irc, msg):
callbacks.Privmsg.doPrivmsg(self, irc, msg)
if not isinstance(irc, irclib.Irc): if not isinstance(irc, irclib.Irc):
irc = irc.getRealIrc() irc = irc.getRealIrc()
if self.started and ircutils.isChannel(msg.args[0]): if self.started and ircutils.isChannel(msg.args[0]):

View File

@ -108,7 +108,6 @@ class URLSnarfer(plugins.ChannelDBHandler, callbacks.Privmsg):
_urlRe = re.compile(r"([^\[<(\s]+://[^\])>\s]+)", re.I) _urlRe = re.compile(r"([^\[<(\s]+://[^\])>\s]+)", re.I)
def doPrivmsg(self, irc, msg): def doPrivmsg(self, irc, msg):
callbacks.Privmsg.doPrivmsg(self, irc, msg)
channel = msg.args[0] channel = msg.args[0]
db = self.getDb(channel) db = self.getDb(channel)
cursor = db.cursor() cursor = db.cursor()

View File

@ -714,9 +714,6 @@ class Privmsg(irclib.IrcCallback):
funcname = '%s.%s' % (f.im_class.__name__, f.im_func.func_name) funcname = '%s.%s' % (f.im_class.__name__, f.im_func.func_name)
debug.msg('%s took %s seconds' % (funcname, elapsed), 'verbose') debug.msg('%s took %s seconds' % (funcname, elapsed), 'verbose')
def doPrivmsg(self, irc, msg, rateLimit=True):
pass
class IrcObjectProxyRegexp: class IrcObjectProxyRegexp:
def __init__(self, irc, *args): def __init__(self, irc, *args):