Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2025-01-11 12:42:34 +01:00
Code Issues Projects Releases Wiki Activity

Fix for privmsgs.thread.

Browse Source
This commit is contained in:
Jeremy Fincher 2004-09-10 06:51:29 +00:00
parent 51ad408ff3
commit d3421b0bd0
1 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/privmsgs.py
View File

@ -129,28 +129,16 @@ def checkChannelCapability(f, capability):
irc.errorNoCapability(chancap) irc.errorNoCapability(chancap)
return utils.changeFunctionName(newf, f.func_name, f.__doc__) return utils.changeFunctionName(newf, f.func_name, f.__doc__)
def _threadedWrapMethod(f):
"""A function to wrap methods that are to be run in a thread, so that the
callback's threaded attribute is set to True while the thread is running.
"""
def newf(self, *args, **kwargs):
originalThreaded = self.threaded
try:
self.threaded = True
return f(self, *args, **kwargs)
finally:
self.threaded = originalThreaded
return utils.changeFunctionName(newf, f.func_name, f.__doc__)
def thread(f): def thread(f):
"""Makes sure a command spawns a thread when called.""" """Makes sure a command spawns a thread when called."""
f = _threadedWrapMethod(f)
def newf(self, irc, msg, args, *L, **kwargs): def newf(self, irc, msg, args, *L, **kwargs):
ff = types.MethodType(f, self, self.__class__) if threading.currentThread() is not world.mainThread:
t = callbacks.CommandThread(target=irc._callCommand, t = callbacks.CommandThread(target=irc._callCommand,
args=(f.func_name, self), args=(f.func_name, self),
kwargs=kwargs) kwargs=kwargs)
t.start() t.start()
else:
f(self, irc, msg, args, *L, **kwargs)
return utils.changeFunctionName(newf, f.func_name, f.__doc__) return utils.changeFunctionName(newf, f.func_name, f.__doc__)
def channel(f): def channel(f):
@ -195,7 +183,6 @@ class SnarfIrc(object):
def urlSnarfer(f): def urlSnarfer(f):
"""Protects the snarfer from loops and whatnot.""" """Protects the snarfer from loops and whatnot."""
f = _threadedWrapMethod(f)
def newf(self, irc, msg, match, *L, **kwargs): def newf(self, irc, msg, match, *L, **kwargs):
channel = msg.args[0] channel = msg.args[0]
if not ircutils.isChannel(channel): if not ircutils.isChannel(channel):