PEP8 clean

This commit is contained in:
nemunaire 2014-11-13 02:51:49 +01:00
commit 2dfe1f0e9a
15 changed files with 338 additions and 168 deletions

View file

@ -14,6 +14,7 @@ nemubotversion = 3.4
from more import Response
def load(context):
"""Load this module"""
global DATAS
@ -25,9 +26,10 @@ def load(context):
DATAS.getNode("variables").setIndex("name")
def help_full ():
def help_full():
return "TODO"
def set_variable(name, value, creator):
var = ModuleState("variable")
var["name"] = name
@ -35,6 +37,7 @@ def set_variable(name, value, creator):
var["creator"] = creator
DATAS.getNode("variables").addChild(var)
def get_variable(name, msg=None):
if name == "sender" or name == "from" or name == "nick":
return msg.frm
@ -47,14 +50,19 @@ def get_variable(name, msg=None):
else:
return ""
@hook("cmd_hook", "set")
def cmd_set(msg):
if len (msg.cmds) > 2:
if len(msg.cmds) > 2:
set_variable(msg.cmds[1], " ".join(msg.cmds[2:]), msg.nick)
res = Response("Variable \$%s définie." % msg.cmds[1], channel=msg.channel)
res = Response("Variable \$%s définie." % msg.cmds[1],
channel=msg.channel)
save()
return res
return Response("!set prend au minimum deux arguments : le nom de la variable et sa valeur.", channel=msg.channel)
return Response("!set prend au minimum deux arguments : "
"le nom de la variable et sa valeur.",
channel=msg.channel)
@hook("cmd_hook", "listalias")
def cmd_listalias(msg):
@ -68,7 +76,10 @@ def cmd_listalias(msg):
res.append("%s n'a pas encore créé d'alias" % user)
return Response(" ; ".join(res), channel=msg.channel)
else:
return Response("Alias connus : %s." % ", ".join(DATAS.getNode("aliases").index.keys()), channel=msg.channel)
return Response("Alias connus : %s." %
", ".join(DATAS.getNode("aliases").index.keys()),
channel=msg.channel)
@hook("cmd_hook", "listvars")
def cmd_listvars(msg):
@ -82,18 +93,21 @@ def cmd_listvars(msg):
res.append("%s n'a pas encore créé de variable" % user)
return Response(" ; ".join(res), channel=msg.channel)
else:
return Response("Variables connues : %s." % ", ".join(DATAS.getNode("variables").index.keys()), channel=msg.channel)
return Response("Variables connues : %s." %
", ".join(DATAS.getNode("variables").index.keys()),
channel=msg.channel)
@hook("cmd_hook", "alias")
def cmd_alias(msg):
if len (msg.cmds) > 1:
if len(msg.cmds) > 1:
res = list()
for alias in msg.cmds[1:]:
if alias[0] == "!":
alias = alias[1:]
if alias in DATAS.getNode("aliases").index:
res.append(Response("!%s correspond à %s" % (alias,
DATAS.getNode("aliases").index[alias]["origin"]),
res.append(Response("!%s correspond à %s" %
(alias, DATAS.getNode("aliases").index[alias]["origin"]),
channel=msg.channel))
else:
res.append(Response("!%s n'est pas un alias" % alias,
@ -103,9 +117,10 @@ def cmd_alias(msg):
return Response("!alias prend en argument l'alias à étendre.",
channel=msg.channel)
@hook("cmd_hook", "unalias")
def cmd_unalias(msg):
if len (msg.cmds) > 1:
if len(msg.cmds) > 1:
res = list()
for alias in msg.cmds[1:]:
if alias[0] == "!" and len(alias) > 1:
@ -113,31 +128,38 @@ def cmd_unalias(msg):
if alias in DATAS.getNode("aliases").index:
if DATAS.getNode("aliases").index[alias]["creator"] == msg.nick or msg.frm_owner:
DATAS.getNode("aliases").delChild(DATAS.getNode("aliases").index[alias])
res.append(Response("%s a bien été supprimé" % alias, channel=msg.channel))
res.append(Response("%s a bien été supprimé" % alias,
channel=msg.channel))
else:
res.append(Response("Vous n'êtes pas le createur de l'alias %s." % alias, channel=msg.channel))
res.append(Response("Vous n'êtes pas le createur de "
"l'alias %s." % alias,
channel=msg.channel))
else:
res.append(Response("%s n'est pas un alias" % alias, channel=msg.channel))
res.append(Response("%s n'est pas un alias" % alias,
channel=msg.channel))
return res
else:
return Response("!unalias prend en argument l'alias à supprimer.", channel=msg.channel)
return Response("!unalias prend en argument l'alias à supprimer.",
channel=msg.channel)
def replace_variables(cnt, msg=None):
cnt = cnt.split(' ')
unsetCnt = list()
for i in range(0, len(cnt)):
if i not in unsetCnt:
res = re.match("^([^$]*)(\\\\)?\\$([a-zA-Z0-9]+)(.*)$", cnt[i])
if res is not None:
try:
varI = int(res.group(3))
unsetCnt.append(varI)
cnt[i] = res.group(1) + msg.cmds[varI] + res.group(4)
except:
if res.group(2) != "":
cnt[i] = res.group(1) + "$" + res.group(3) + res.group(4)
else:
cnt[i] = res.group(1) + get_variable(res.group(3), msg) + res.group(4)
if i not in unsetCnt:
res = re.match("^([^$]*)(\\\\)?\\$([a-zA-Z0-9]+)(.*)$", cnt[i])
if res is not None:
try:
varI = int(res.group(3))
unsetCnt.append(varI)
cnt[i] = res.group(1) + msg.cmds[varI] + res.group(4)
except:
if res.group(2) != "":
cnt[i] = res.group(1) + "$" + res.group(3) + res.group(4)
else:
cnt[i] = (res.group(1) + get_variable(res.group(3), msg) +
res.group(4))
return " ".join(cnt)
@ -174,7 +196,8 @@ def parseask(msg):
alias["origin"] = result.group(3)
alias["creator"] = msg.nick
DATAS.getNode("aliases").addChild(alias)
res = Response("Nouvel alias %s défini avec succès." % result.group(1), channel=msg.channel)
res = Response("Nouvel alias %s défini avec succès." %
result.group(1), channel=msg.channel)
save()
return res
return None