Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2025-06-14 02:37:21 +02:00
Code Issues Projects Releases Wiki Activity

Unbreak invalidCommands.

Browse Source
This commit is contained in:
James Vega 2005-04-20 23:06:50 +00:00
parent 948571c17f
commit e7e72d4484
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/callbacks.py
View File

@ -543,7 +543,7 @@ class ReplyIrcProxy(RichReplyMethods):
def __ne__(self, other): def __ne__(self, other):
return not (self == other) return not (self == other)
__rne__ = __ne__ __rne__ = __ne__
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:
@ -666,7 +666,7 @@ class NestedCommandsIrcProxy(ReplyIrcProxy):
return return
if threaded: if threaded:
name = 'Thread #%s (for invalidCommands)' % world.threadsSpawned name = 'Thread #%s (for invalidCommands)' % world.threadsSpawned
t = world.SupyThread(callInvalidCommands, name=name) t = world.SupyThread(target=callInvalidCommands, name=name)
t.setDaemon(True) t.setDaemon(True)
t.start() t.start()
else: else:
@ -1051,7 +1051,7 @@ class Commands(BasePlugin):
def canonicalName(self): def canonicalName(self):
return canonicalName(self.name()) return canonicalName(self.name())
def isDisabled(self, command): def isDisabled(self, command):
return self._disabled.disabled(command, self.name()) return self._disabled.disabled(command, self.name())
@ -1097,7 +1097,7 @@ class Commands(BasePlugin):
if self.isCommandMethod(first): if self.isCommandMethod(first):
return [first] return [first]
return [] return []
def getCommandMethod(self, command): def getCommandMethod(self, command):
"""Gets the given command from this plugin.""" """Gets the given command from this plugin."""
#print '*** %s.getCommandMethod(%r)' % (self.name(), command) #print '*** %s.getCommandMethod(%r)' % (self.name(), command)
@ -1127,7 +1127,7 @@ class Commands(BasePlugin):
commands.append(' '.join([name, command])) commands.append(' '.join([name, command]))
commands.sort() commands.sort()
return commands return commands
def callCommand(self, command, irc, msg, *args, **kwargs): def callCommand(self, command, irc, msg, *args, **kwargs):
method = self.getCommandMethod(command) method = self.getCommandMethod(command)
method(irc, msg, *args, **kwargs) method(irc, msg, *args, **kwargs)
@ -1190,7 +1190,7 @@ class PluginMixin(BasePlugin, irclib.IrcCallback):
def canonicalName(self): def canonicalName(self):
return canonicalName(self.name()) return canonicalName(self.name())
def __call__(self, irc, msg): def __call__(self, irc, msg):
irc = SimpleProxy(irc, msg) irc = SimpleProxy(irc, msg)
if msg.command == 'PRIVMSG': if msg.command == 'PRIVMSG':
@ -1300,13 +1300,13 @@ class PluginRegexp(Plugin):
irc.error(str(e)) irc.error(str(e))
except Exception, e: except Exception, e:
self.log.exception('Uncaught exception in _callRegexp:') self.log.exception('Uncaught exception in _callRegexp:')
def invalidCommand(self, irc, msg, tokens): def invalidCommand(self, irc, msg, tokens):
s = ' '.join(tokens) s = ' '.join(tokens)
for (r, name) in self.addressedRes: for (r, name) in self.addressedRes:
for m in r.finditer(s): for m in r.finditer(s):
self._callRegexp(name, irc, msg, m) self._callRegexp(name, irc, msg, m)
def doPrivmsg(self, irc, msg): def doPrivmsg(self, irc, msg):
if msg.isError: if msg.isError:
return return