From 41087789cee5b8725903f366571eff937730a9ac Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sun, 16 Feb 2014 22:31:59 +0100
Subject: [PATCH] Made unittesting suite work again.

---
 src/objects/models.py     | 11 ++---------
 src/players/models.py     |  2 +-
 src/typeclasses/models.py |  3 +--
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/objects/models.py b/src/objects/models.py
index 5b8b0595a8..37e9e1c651 100644
--- a/src/objects/models.py
+++ b/src/objects/models.py
@@ -374,15 +374,8 @@ class ObjectDB(TypedObject):
             return self.typeclass
 
         if use_nicks:
-            # get all valid nicks to search
-            nicks = self.nicks.get(category="object")
-            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
+            # do nick-replacement on search
+            searchdata = self.nicks.nickreplace(searchdata, categories=("object", "player"), include_player=True)
 
         candidates=None
         if(global_search or (is_string and searchdata.startswith("#") and
diff --git a/src/players/models.py b/src/players/models.py
index 03789e52f6..22e363819e 100644
--- a/src/players/models.py
+++ b/src/players/models.py
@@ -424,7 +424,7 @@ class PlayerDB(TypedObject, AbstractUser):
         # nick replacement - we require full-word matching.
 
         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)
         if not sessid and _MULTISESSION_MODE in (0, 1):
             # in this case, we should either have only one sessid, or the sessid
diff --git a/src/typeclasses/models.py b/src/typeclasses/models.py
index 276d4659bf..98ab236e7c 100644
--- a/src/typeclasses/models.py
+++ b/src/typeclasses/models.py
@@ -400,11 +400,10 @@ class NickHandler(AttributeHandler):
 
     def nickreplace(self, raw_string, categories=("inputline", "channels"), include_player=True):
         "Replace entries in raw_string with nick replacement"
-        obj_nicks = []
+        obj_nicks, player_nicks = [], []
         for category in make_iter(categories):
             obj_nicks.extend(make_iter(self.get(category=category, return_obj=True)))
         if include_player and self.obj.has_player:
-            player_nicks = []
             for category in make_iter(categories):
                 player_nicks.extend(make_iter(self.obj.player.nicks.get(category=category, return_obj=True)))
         for nick in obj_nicks + player_nicks: