Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Some minor fixes to the default @py output and also some more info to the extended_room contrib.

Browse source
This commit is contained in:
Griatch 2012-10-20 21:04:00 +02:00
parent 86c5553208
commit 3f01ab8006
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/commands/default/system.py
View file

@ -149,20 +149,22 @@ class CmdPy(MuxCommand):
'ev':ev,
'inherits_from':utils.inherits_from}
caller.msg(">>> %s" % pycode)
caller.msg(">>> %s{n" % pycode)
try:
ret = eval(pycode, {}, available_vars)
ret = "<<< %s" % str(ret)
if ret != None:
ret = "{n<<< %s" % str(ret)
except Exception:
try:
exec(pycode, {}, available_vars)
ret = "<<< Done."
ret = "{n<<< Done."
except Exception:
errlist = traceback.format_exc().split('\n')
if len(errlist) > 4:
errlist = errlist[4:]
ret = "\n".join("<<< %s" % line for line in errlist if line)
caller.msg(ret)
ret = "\n".join("{n<<< %s" % line for line in errlist if line)
if ret != None:
caller.msg(ret)
# helper function. Kept outside so it can be imported and run
# by other commands.