Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-10-01 17:16:31 +02:00
Code Issues Projects Releases Wiki Activity

Web: Use new-style command wrap (as a decorator).

Browse Source
This commit is contained in:
Valentin Lorentz 2016-12-08 00:36:30 +01:00
parent b46ea6f6bc
commit 4acb692f17
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
plugins/Web/plugin.py
View File

@ -216,9 +216,9 @@ class Web(callbacks.PluginRegexp):
break break
return passed return passed
@wrap(['httpUrl'])
@catch_web_errors @catch_web_errors
@fetch_sandbox @fetch_sandbox
@internationalizeDocstring
def headers(self, irc, msg, args, url): def headers(self, irc, msg, args, url):
"""<url> """<url>
@ -235,12 +235,11 @@ class Web(callbacks.PluginRegexp):
irc.reply(s) irc.reply(s)
finally: finally:
fd.close() fd.close()
headers = wrap(headers, ['httpUrl'])
_doctypeRe = re.compile(r'(<!DOCTYPE[^>]+>)', re.M) _doctypeRe = re.compile(r'(<!DOCTYPE[^>]+>)', re.M)
@wrap(['httpUrl'])
@catch_web_errors @catch_web_errors
@fetch_sandbox @fetch_sandbox
@internationalizeDocstring
def doctype(self, irc, msg, args, url): def doctype(self, irc, msg, args, url):
"""<url> """<url>
@ -259,11 +258,10 @@ class Web(callbacks.PluginRegexp):
irc.reply(s) irc.reply(s)
else: else:
irc.reply(_('That URL has no specified doctype.')) irc.reply(_('That URL has no specified doctype.'))
doctype = wrap(doctype, ['httpUrl'])
@wrap(['httpUrl'])
@catch_web_errors @catch_web_errors
@fetch_sandbox @fetch_sandbox
@internationalizeDocstring
def size(self, irc, msg, args, url): def size(self, irc, msg, args, url):
"""<url> """<url>
@ -289,11 +287,10 @@ class Web(callbacks.PluginRegexp):
url, size)) url, size))
finally: finally:
fd.close() fd.close()
size = wrap(size, ['httpUrl'])
@wrap([getopts({'no-filter': ''}), 'httpUrl'])
@catch_web_errors @catch_web_errors
@fetch_sandbox @fetch_sandbox
@internationalizeDocstring
def title(self, irc, msg, args, optlist, url): def title(self, irc, msg, args, optlist, url):
"""[--no-filter] <url> """[--no-filter] <url>
@ -313,18 +310,16 @@ class Web(callbacks.PluginRegexp):
for i in range(1, 4): for i in range(1, 4):
title = title.replace(chr(i), '') title = title.replace(chr(i), '')
irc.reply(title) irc.reply(title)
title = wrap(title, [getopts({'no-filter': ''}), 'httpUrl'])
@internationalizeDocstring @wrap(['text'])
def urlquote(self, irc, msg, args, text): def urlquote(self, irc, msg, args, text):
"""<text> """<text>
Returns the URL quoted form of the text. Returns the URL quoted form of the text.
""" """
irc.reply(utils.web.urlquote(text)) irc.reply(utils.web.urlquote(text))
urlquote = wrap(urlquote, ['text'])
@internationalizeDocstring @wrap(['text'])
def urlunquote(self, irc, msg, args, text): def urlunquote(self, irc, msg, args, text):
"""<text> """<text>
@ -332,11 +327,10 @@ class Web(callbacks.PluginRegexp):
""" """
s = utils.web.urlunquote(text) s = utils.web.urlunquote(text)
irc.reply(s) irc.reply(s)
urlunquote = wrap(urlunquote, ['text'])
@wrap(['url'])
@catch_web_errors @catch_web_errors
@fetch_sandbox @fetch_sandbox
@internationalizeDocstring
def fetch(self, irc, msg, args, url): def fetch(self, irc, msg, args, url):
"""<url> """<url>
@ -355,7 +349,6 @@ class Web(callbacks.PluginRegexp):
fd = utils.web.getUrl(url, size=max) \ fd = utils.web.getUrl(url, size=max) \
.decode('utf8') .decode('utf8')
irc.reply(fd) irc.reply(fd)
fetch = wrap(fetch, ['url'])
Class = Web Class = Web