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

Made unittesting suite work again.

Browse source
This commit is contained in:
Griatch 2014-02-16 22:31:59 +01:00
parent 85225b3084
commit 41087789ce
3 changed files with 4 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/objects/models.py
View file

@ -374,15 +374,8 @@ class ObjectDB(TypedObject):
return self.typeclass return self.typeclass
if use_nicks: if use_nicks:
# get all valid nicks to search # do nick-replacement on search
nicks = self.nicks.get(category="object") searchdata = self.nicks.nickreplace(searchdata, categories=("object", "player"), include_player=True)
if self.has_player:
pnicks = self.nicks.get(category="player")
nicks = nicks + pnicks
for nick in nicks:
if searchdata == nick.db_key:
searchdata = nick.strvalue
break
candidates=None candidates=None
if(global_search or (is_string and searchdata.startswith("#") and if(global_search or (is_string and searchdata.startswith("#") and

2
src/players/models.py
View file

@ -424,7 +424,7 @@ class PlayerDB(TypedObject, AbstractUser):
# nick replacement - we require full-word matching. # nick replacement - we require full-word matching.
raw_string = utils.to_unicode(raw_string) raw_string = utils.to_unicode(raw_string)
raw_string = self.nicks.nickreplacement(raw_string, raw_string = self.nicks.nickreplace(raw_string,
categories=("inputline", "channels"), include_player=False) categories=("inputline", "channels"), include_player=False)
if not sessid and _MULTISESSION_MODE in (0, 1): if not sessid and _MULTISESSION_MODE in (0, 1):
# in this case, we should either have only one sessid, or the sessid # in this case, we should either have only one sessid, or the sessid

3
src/typeclasses/models.py
View file

@ -400,11 +400,10 @@ class NickHandler(AttributeHandler):
def nickreplace(self, raw_string, categories=("inputline", "channels"), include_player=True): def nickreplace(self, raw_string, categories=("inputline", "channels"), include_player=True):
"Replace entries in raw_string with nick replacement" "Replace entries in raw_string with nick replacement"
obj_nicks = [] obj_nicks, player_nicks = [], []
for category in make_iter(categories): for category in make_iter(categories):
obj_nicks.extend(make_iter(self.get(category=category, return_obj=True))) obj_nicks.extend(make_iter(self.get(category=category, return_obj=True)))
if include_player and self.obj.has_player: if include_player and self.obj.has_player:
player_nicks = []
for category in make_iter(categories): for category in make_iter(categories):
player_nicks.extend(make_iter(self.obj.player.nicks.get(category=category, return_obj=True))) player_nicks.extend(make_iter(self.obj.player.nicks.get(category=category, return_obj=True)))
for nick in obj_nicks + player_nicks: for nick in obj_nicks + player_nicks: