Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-03-25 17:26:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed unittest suite to use dummy sessions.

Browse source
This commit is contained in:
Griatch 2013-09-22 16:29:02 +02:00
parent 4659ddbfc3
commit bbba695380
6 changed files with 66 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/objects/models.py
View file

@ -29,7 +29,7 @@ from src.commands.cmdsethandler import CmdSetHandler
from src.commands import cmdhandler
from src.scripts.scripthandler import ScriptHandler
from src.utils import logger
from src.utils.utils import make_iter, to_unicode, variable_from_module, inherits_from
from src.utils.utils import make_iter, to_str, to_unicode, variable_from_module, inherits_from
from django.utils.translation import ugettext as _
@ -675,7 +675,7 @@ class ObjectDB(TypedObject):
if not _SESSIONS:
from src.server.sessionhandler import SESSIONS as _SESSIONS
text = utils.to_str(text, force_string=True) if text else ""
text = to_str(text, force_string=True) if text else ""
if "data" in kwargs:
# deprecation warning
@ -705,8 +705,7 @@ class ObjectDB(TypedObject):
contents = _GA(self, "contents")
if exclude:
exclude = make_iter(exclude)
contents = [obj for obj in contents
if (obj not in exclude and obj not in exclude)]
contents = [obj for obj in contents if obj not in exclude]
for obj in contents:
obj.msg(message, from_obj=from_obj, **kwargs)