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

Conditional: Don't import * from commands and remove the hack for any/all.

Browse Source
This commit is contained in:
Valentin Lorentz 2015-11-09 19:10:19 +01:00
parent 8bdab5e23e
commit b3dbde18b8
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/Conditional/plugin.py
View File

@ -29,8 +29,8 @@
###
import supybot.utils as utils
from supybot.commands import *
import supybot.plugins as plugins
import supybot.commands as commands
import supybot.ircutils as ircutils
import supybot.callbacks as callbacks
@ -46,12 +46,10 @@ except:
_ = lambda x:x
internationalizeDocstring = lambda x:x
if isinstance(__builtins__, dict):
_any = __builtins__['any']
_all = __builtins__['all']
else:
_any = __builtins__.any
_all = __builtins__.all
first = commands.first
many = commands.many
wrap = commands.wrap
getopts = commands.getopts
boolean_or_int = first('int', 'boolean')
@ -94,7 +92,7 @@ class Conditional(callbacks.Plugin):
Returns true if all conditions supplied evaluate to true.
"""
if _all(conds):
if all(conds):
irc.reply("true")
else:
irc.reply("false")
@ -106,7 +104,7 @@ class Conditional(callbacks.Plugin):
Returns true if any one of conditions supplied evaluates to true.
"""
if _any(conds):
if any(conds):
irc.reply("true")
else:
irc.reply("false")