Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-11-23 11:09:23 +01:00
Code Issues Projects Releases Wiki Activity

Web: Fix nesting of commands (bug introduced in d8a4ef8421).

Browse Source
This commit is contained in:
Valentin Lorentz 2013-08-20 11:37:39 +02:00
parent d14f5df76f
commit 790bda4664
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/Web/plugin.py
View File

@ -70,14 +70,13 @@ class Title(HTMLParser.HTMLParser):
self.title += self.entitydefs[name] self.title += self.entitydefs[name]
class DelayedIrc: class DelayedIrc:
def __init__(self, irc, msg): def __init__(self, irc):
self._irc = irc self._irc = irc
self._msg = msg
self._replies = [] self._replies = []
def reply(self, *args, **kwargs): def reply(self, *args, **kwargs):
self._replies.append(callbacks.reply(self._msg, *args, **kwargs)) self._replies.append(('reply', args, kwargs))
def error(self, *args, **kwargs): def error(self, *args, **kwargs):
self._replies.append(callbacks.error(self._msg, *args, **kwargs)) self._replies.append(('error', args, kwargs))
def __getattr__(self, name): def __getattr__(self, name):
assert name not in ('reply', 'error', '_irc', '_msg', '_replies') assert name not in ('reply', 'error', '_irc', '_msg', '_replies')
return getattr(self._irc, name) return getattr(self._irc, name)
@ -86,7 +85,7 @@ def fetch_sandbox(f):
"""Runs a command in a forked process with limited memory resources """Runs a command in a forked process with limited memory resources
to prevent memory bomb caused by specially crafted http responses.""" to prevent memory bomb caused by specially crafted http responses."""
def process(self, irc, msg, *args, **kwargs): def process(self, irc, msg, *args, **kwargs):
delayed_irc = DelayedIrc(irc, msg) delayed_irc = DelayedIrc(irc)
f(self, delayed_irc, msg, *args, **kwargs) f(self, delayed_irc, msg, *args, **kwargs)
return delayed_irc._replies return delayed_irc._replies
def newf(self, irc, *args): def newf(self, irc, *args):
@ -97,8 +96,8 @@ def fetch_sandbox(f):
except commands.ProcessTimeoutError: except commands.ProcessTimeoutError:
raise utils.web.Error(_('Page is too big.')) raise utils.web.Error(_('Page is too big.'))
else: else:
for reply in replies: for (method, args, kwargs) in replies:
irc.queueMsg(reply) getattr(irc, method)(*args, **kwargs)
newf.__doc__ = f.__doc__ newf.__doc__ = f.__doc__
return newf return newf