1
0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-12-23 11:12:47 +01:00

Merge branch 'testing'

This commit is contained in:
Valentin Lorentz 2011-04-09 15:25:01 +02:00
commit 8344166fa1

View File

@ -325,8 +325,6 @@ class Factoids(callbacks.Plugin, plugins.ChannelDBHandler):
self._replyFactoids(irc, msg, key, channel, factoids, number, raw=raw)
else:
self._replyApproximateFactoids(irc, msg, channel, key)
whatis = wrap(whatis, ['channel', many('something')])
whatis = wrap(whatis, ['channel',
getopts({'raw': '',}),
many('something')])
@ -398,7 +396,6 @@ class Factoids(callbacks.Plugin, plugins.ChannelDBHandler):
irc.replySuccess()
else:
irc.error(_('This key-factoid relationship already exists.'))
alias = wrap(alias, ['channel', 'something', 'something', optional('int')])
@internationalizeDocstring