From 617d0a3252a05864955d6c761c67c88745c6b669 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sun, 16 Feb 2014 15:22:43 +0100
Subject: [PATCH] Added new handler calls to all typeclassed objects

---
 src/comms/models.py   | 6 +++---
 src/objects/models.py | 4 ++--
 src/players/models.py | 4 ++--
 src/scripts/models.py | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/comms/models.py b/src/comms/models.py
index 0b0136d7d..793ace343 100644
--- a/src/comms/models.py
+++ b/src/comms/models.py
@@ -28,7 +28,7 @@ from src.comms import managers
 from src.comms.managers import identify_object
 from src.locks.lockhandler import LockHandler
 from src.utils import logger
-from src.utils.utils import is_iter, to_str, crop, make_iter
+from src.utils.utils import to_str, crop, make_iter
 
 __all__ = ("Msg", "TempMsg", "ChannelDB",
             "PlayerChannelConnection", "ExternalChannelConnection")
@@ -365,9 +365,9 @@ class ChannelDB(TypedObject):
 
     def __init__(self, *args, **kwargs):
         TypedObject.__init__(self, *args, **kwargs)
-        _SA(self, "tags", TagHandler(self, category_prefix="comm_"))
-        _SA(self, "aliases", AliasHandler(self, category_prefix="comm_"))
         _SA(self, "attributes", AttributeHandler(self))
+        _SA(self, "tags", TagHandler(self))
+        _SA(self, "aliases", AliasHandler(self))
 
     class Meta:
         "Define Django meta options"
diff --git a/src/objects/models.py b/src/objects/models.py
index 0ce22c608..3d81c1325 100644
--- a/src/objects/models.py
+++ b/src/objects/models.py
@@ -143,9 +143,9 @@ class ObjectDB(TypedObject):
         _GA(self, "cmdset").update(init_mode=True)
         _SA(self, "scripts", ScriptHandler(self))
         _SA(self, "attributes", AttributeHandler(self))
-        _SA(self, "tags", TagHandler(self, category_prefix="object"))
-        _SA(self, "aliases", AliasHandler(self, category_prefix="object"))
         _SA(self, "nicks", NickHandler(self))
+        _SA(self, "tags", TagHandler(self))
+        _SA(self, "aliases", AliasHandler(self))
         # make sure to sync the contents cache when initializing
         #_GA(self, "contents_update")()
 
diff --git a/src/players/models.py b/src/players/models.py
index d16e1330d..e97fb04ee 100644
--- a/src/players/models.py
+++ b/src/players/models.py
@@ -114,9 +114,9 @@ class PlayerDB(TypedObject, AbstractUser):
         _SA(self, "cmdset", CmdSetHandler(self))
         _GA(self, "cmdset").update(init_mode=True)
         _SA(self, "attributes", AttributeHandler(self))
-        _SA(self, "tags", TagHandler(self, category_prefix="player_"))
-        _SA(self, "aliases", AliasHandler(self, category_prefix="player_"))
         _SA(self, "nicks", NickHandler(self))
+        _SA(self, "tags", TagHandler(self))
+        _SA(self, "aliases", AliasHandler(self))
 
     # alias to the objs property
     def __characters_get(self):
diff --git a/src/scripts/models.py b/src/scripts/models.py
index 22945ddf9..75bd09335 100644
--- a/src/scripts/models.py
+++ b/src/scripts/models.py
@@ -106,9 +106,9 @@ class ScriptDB(TypedObject):
 
     def __init__(self, *args, **kwargs):
         super(ScriptDB, self).__init__(*args, **kwargs)
-        _SA(self, "tags", TagHandler(self, category_prefix="script_"))
         _SA(self, "attributes", AttributeHandler(self))
-        #_SA(self, "aliases", AliasHandler(self, category_prefix="script_"))
+        _SA(self, "tags", TagHandler(self))
+        #_SA(self, "aliases", AliasHandler(self))
 
     #
     #