From d1a5457080e31a2db8f5d3e2ea875e33c353ca82 Mon Sep 17 00:00:00 2001 From: Jeremy Fincher Date: Thu, 27 Mar 2003 07:26:46 +0000 Subject: [PATCH] Changed privmsgs.CapabilityChecker to privmsgs.CapabilityCheckingPrivmsg --- src/AdminCommands.py | 2 +- src/privmsgs.py | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/AdminCommands.py b/src/AdminCommands.py index 47b2f5da2..d8c891019 100755 --- a/src/AdminCommands.py +++ b/src/AdminCommands.py @@ -41,7 +41,7 @@ import ircmsgs import privmsgs import callbacks -class AdminCommands(privmsgs.CapabilityChecker): +class AdminCommands(privmsgs.CapabilityCheckingPrivmsg): capability = 'admin' def join(self, irc, msg, args): """ [ ...] diff --git a/src/privmsgs.py b/src/privmsgs.py index a85b346e5..5c5367557 100644 --- a/src/privmsgs.py +++ b/src/privmsgs.py @@ -105,7 +105,7 @@ def getKeywordArgs(irc, msg, d=None): return (args, d) -class CapabilityChecker(callbacks.Privmsg): +class CapabilityCheckingPrivmsg(callbacks.Privmsg): def callCommand(self, f, irc, msg, args): if ircdb.checkCapability(msg.prefix, self.capability): callbacks.Privmsg.callCommand(self, f, irc, msg, args) @@ -113,7 +113,7 @@ class CapabilityChecker(callbacks.Privmsg): irc.error(msg, conf.replyNoCapability % self.capability) -class OwnerCommands(CapabilityChecker): +class OwnerCommands(CapabilityCheckingPrivmsg): capability = 'owner' def __init__(self): callbacks.Privmsg.__init__(self) @@ -311,7 +311,6 @@ class OwnerCommands(CapabilityChecker): irc.error(msg, 'There was no callback %s' % name) - standardPrivmsgModules = [OwnerCommands] # vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78: