From 90c6ade56deee9ca35009accdd1d391fd37ed570 Mon Sep 17 00:00:00 2001 From: Griatch Date: Sun, 11 Oct 2015 19:08:32 +0200 Subject: [PATCH] Made sure the command sends raw evals as raw data. Resolves #816. This removes color completely from raw evals but they will still be present if using self.msg() in the evaluation (if doing so, this particular side effect still exists too though). --- evennia/commands/default/system.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/evennia/commands/default/system.py b/evennia/commands/default/system.py index c22b38bd76..331d294091 100644 --- a/evennia/commands/default/system.py +++ b/evennia/commands/default/system.py @@ -194,23 +194,23 @@ class CmdPy(MuxCommand): t0 = timemeasure() ret = eval(pycode_compiled, {}, available_vars) t1 = timemeasure() - duration = " (%.4f ms)" % ((t1 - t0) * 1000) + duration = " (runtime ~ %.4f ms)" % ((t1 - t0) * 1000) else: ret = eval(pycode_compiled, {}, available_vars) if mode == "eval": - ret = "{n<<< %s%s" % (str(ret), duration) + ret = "<<< %s%s" % (str(ret), duration) else: - ret = "{n<<< Done.%s" % duration + ret = "<<< Done (use self.msg() if you want to catch output)%s" % duration except Exception: errlist = traceback.format_exc().split('\n') if len(errlist) > 4: errlist = errlist[4:] - ret = "\n".join("{n<<< %s" % line for line in errlist if line) + ret = "\n".join("<<< %s" % line for line in errlist if line) try: - self.msg(ret, sessid=self.sessid) + self.msg(ret, sessid=self.sessid, raw=True) except TypeError: - self.msg(ret) + self.msg(ret, raw=True) # helper function. Kept outside so it can be imported and run