Made the SimpleProxy interface a little more consistent with IrcObjectProxy.

This commit is contained in:
Jeremy Fincher 2005-03-14 03:52:30 +00:00
parent 9ec4493201
commit 3d60b66ee2

View File

@ -1212,6 +1212,12 @@ class SimpleProxy(RichReplyMethods):
self.irc = irc self.irc = irc
self.msg = msg self.msg = msg
def getRealIrc(self):
if isinstance(self.irc, irclib.Irc):
return self.irc
else:
return self.irc.getRealIrc()
def error(self, s, msg=None, **kwargs): def error(self, s, msg=None, **kwargs):
if 'Raise' in kwargs and kwargs['Raise']: if 'Raise' in kwargs and kwargs['Raise']:
if s: if s:
@ -1229,6 +1235,7 @@ class SimpleProxy(RichReplyMethods):
msg = self.msg msg = self.msg
assert not isinstance(s, ircmsgs.IrcMsg), \ assert not isinstance(s, ircmsgs.IrcMsg), \
'Old code alert: there is no longer a "msg" argument to reply.' 'Old code alert: there is no longer a "msg" argument to reply.'
kwargs.pop('noLengthCheck', None)
m = reply(msg, s, **kwargs) m = reply(msg, s, **kwargs)
self.irc.queueMsg(m) self.irc.queueMsg(m)
return m return m