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

Factoids: fix merge problem (duplicated wrap()-ing). Thanks kini fore the report

Browse Source
This commit is contained in:
Valentin Lorentz 2011-04-09 15:24:52 +02:00
parent ab087f4b45
commit 2791955209
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/Factoids/plugin.py
View File

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