Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-04-03 06:27:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some further fixes.

Browse source
This commit is contained in:
Griatch 2013-02-14 17:55:05 +01:00
parent e345d659fd
commit 4dea96f5e4
4 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/commands/default/building.py
View file

@ -1614,6 +1614,10 @@ class CmdExamine(ObjManipCommand):
string = "\n{wName/key{n: {c%s{n (%s)" % (obj.name, obj.dbref)
if hasattr(obj, "aliases") and obj.aliases:
string += "\n{wAliases{n: %s" % (", ".join(utils.make_iter(obj.aliases)))
if hasattr(obj, "sessid") and obj.sessid:
string += "\n{wsession{n: %s" % obj.sessid
elif hasattr(obj, "sessions") and obj.sessions:
string += "\n{wsession(s){n: %s" % (", ".join(str(sess.sessid) for sess in obj.sessions))
if hasattr(obj, "has_player") and obj.has_player:
string += "\n{wPlayer{n: {c%s{n" % obj.player.name
perms = obj.player.permissions

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

@ -156,7 +156,11 @@ class CmdPy(MuxCommand):
'ev':ev,
'inherits_from':utils.inherits_from}
caller.msg(">>> %s" % pycode, data={"raw":True}, sessid=self.sessid)
try:
caller.msg(">>> %s" % pycode, data={"raw":True}, sessid=self.sessid)
except TypeError:
caller.msg(">>> %s" % pycode, data={"raw":True})
mode = "eval"
try:
@ -185,7 +189,11 @@ class CmdPy(MuxCommand):
ret = "\n".join("{n<<< %s" % line for line in errlist if line)
if ret != None:
caller.msg(ret, sessid=self.sessid)
try:
caller.msg(ret, sessid=self.sessid)
except TypeError:
caller.msg(ret)
# helper function. Kept outside so it can be imported and run
# by other commands.