Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2025-01-10 20:22:36 +01:00
Code Issues Projects Releases Wiki Activity

callbacks.py: Remove duplicated getRealIrc() definition

Browse Source 
NestedCommandsIrcProxy inherits the method from ReplyIrcProxy.
(Also fix some typos.)

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
This commit is contained in:
Štěpán Němec 2009-08-14 17:22:23 +02:00 committed by James Vega
parent 2fa0f6dedc
commit 53cac5b078
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/callbacks.py
View File

@ -528,6 +528,7 @@ class ReplyIrcProxy(RichReplyMethods):
self.msg = msg self.msg = msg
def getRealIrc(self): def getRealIrc(self):
"""Returns the real irclib.Irc object underlying this proxy chain."""
if isinstance(self.irc, irclib.Irc): if isinstance(self.irc, irclib.Irc):
return self.irc return self.irc
else: else:
@ -572,7 +573,7 @@ class ReplyIrcProxy(RichReplyMethods):
SimpleProxy = ReplyIrcProxy # Backwards-compatibility SimpleProxy = ReplyIrcProxy # Backwards-compatibility
class NestedCommandsIrcProxy(ReplyIrcProxy): class NestedCommandsIrcProxy(ReplyIrcProxy):
"A proxy object to allow proper nested of commands (even threaded ones)." "A proxy object to allow proper nesting of commands (even threaded ones)."
_mores = ircutils.IrcDict() _mores = ircutils.IrcDict()
def __init__(self, irc, msg, args, nested=0): def __init__(self, irc, msg, args, nested=0):
assert isinstance(args, list), 'Args should be a list, not a string.' assert isinstance(args, list), 'Args should be a list, not a string.'
@ -939,13 +940,6 @@ class NestedCommandsIrcProxy(ReplyIrcProxy):
else: else:
raise ArgumentError raise ArgumentError
def getRealIrc(self):
"""Returns the real irclib.Irc object underlying this proxy chain."""
if isinstance(self.irc, irclib.Irc):
return self.irc
else:
return self.irc.getRealIrc()
def __getattr__(self, attr): def __getattr__(self, attr):
return getattr(self.irc, attr) return getattr(self.irc, attr)
@ -1061,7 +1055,7 @@ class Commands(BasePlugin):
'callCommand', 'callCommand',
'invalidCommand', 'invalidCommand',
) )
# For awhile, a comment stood here to say, "Eventually callCommand." But # For a while, a comment stood here to say, "Eventually callCommand." But
# that's wrong, because we can't do generic error handling in this # that's wrong, because we can't do generic error handling in this
# callCommand -- plugins need to be able to override callCommand and do # callCommand -- plugins need to be able to override callCommand and do
# error handling there (see the Web plugin for an example). # error handling there (see the Web plugin for an example).
@ -1237,7 +1231,7 @@ class PluginMixin(BasePlugin, irclib.IrcCallback):
irc = SimpleProxy(irc, msg) irc = SimpleProxy(irc, msg)
if msg.command == 'PRIVMSG': if msg.command == 'PRIVMSG':
if self.noIgnore or \ if self.noIgnore or \
not ircdb.checkIgnored(msg.prefix,msg.args[0]) or \ not ircdb.checkIgnored(msg.prefix, msg.args[0]) or \
not ircutils.isUserHostmask(msg.prefix): # Some services impl. not ircutils.isUserHostmask(msg.prefix): # Some services impl.
self.__parent.__call__(irc, msg) self.__parent.__call__(irc, msg)
else: else: