From 7b0c96640caf3ef91474e963a84bef258bcabcb0 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Fri, 12 Jul 2013 23:58:22 +0200
Subject: [PATCH] Reverting metaclass wrapper for db_key, will have to look
 into why it behaves strangely.

---
 src/commands/default/system.py | 18 +++++++++---------
 src/typeclasses/models.py      | 26 +++++++++++++-------------
 src/utils/idmapper/base.py     |  1 -
 3 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/src/commands/default/system.py b/src/commands/default/system.py
index 3bd453e032..fe4b56bfeb 100644
--- a/src/commands/default/system.py
+++ b/src/commands/default/system.py
@@ -213,15 +213,15 @@ def format_script_list(scripts):
     table.align = 'r'
     for script in scripts:
         nextrep = script.time_until_next_repeat()
-        print ([script.id,
-                       (not hasattr(script, 'obj') or not script.obj) and "<Global>" or script.obj.key,
-                       script.key,
-                       (not hasattr(script, 'interval') or script.interval < 0) and "--" or "%ss" % script.interval,
-                       not nextrep and "--" or "%ss" % nextrep,
-                       (not hasattr(script, 'repeats') or not script.repeats) and "--" or "%i" % script.repeats,
-                       script.persistent and "*" or "-",
-                       script.typeclass_path.rsplit('.', 1)[-1],
-                       script.desc])
+        #print ([script.id,
+        #               (not hasattr(script, 'obj') or not script.obj) and "<Global>" or script.obj.key,
+        #               script.key,
+        #               (not hasattr(script, 'interval') or script.interval < 0) and "--" or "%ss" % script.interval,
+        #               not nextrep and "--" or "%ss" % nextrep,
+        #               (not hasattr(script, 'repeats') or not script.repeats) and "--" or "%i" % script.repeats,
+        #               script.persistent and "*" or "-",
+        #               script.typeclass_path.rsplit('.', 1)[-1],
+        #               script.desc])
         table.add_row([script.id,
                        (not hasattr(script, 'obj') or not script.obj) and "<Global>" or script.obj.key,
                        script.key,
diff --git a/src/typeclasses/models.py b/src/typeclasses/models.py
index 0f23c9db62..f4cd8b2219 100644
--- a/src/typeclasses/models.py
+++ b/src/typeclasses/models.py
@@ -635,19 +635,19 @@ class TypedObject(SharedMemoryModel):
 
     # key property (wraps db_key)
     #@property
-    #def __key_get(self):
-    #    "Getter. Allows for value = self.key"
-    #    return _GA(self, "db_key")
-    #    #return get_field_cache(self, "key")
-    ##@key.setter
-    #def __key_set(self, value):
-    #    "Setter. Allows for self.key = value"
-    #    set_field_cache(self, "key", value)
-    ##@key.deleter
-    #def __key_del(self):
-    #    "Deleter. Allows for del self.key"
-    #    raise Exception("Cannot delete objectdb key!")
-    #key = property(__key_get, __key_set, __key_del)
+    def __key_get(self):
+        "Getter. Allows for value = self.key"
+        return _GA(self, "db_key")
+        #return get_field_cache(self, "key")
+    #@key.setter
+    def __key_set(self, value):
+        "Setter. Allows for self.key = value"
+        set_field_cache(self, "key", value)
+    #@key.deleter
+    def __key_del(self):
+        "Deleter. Allows for del self.key"
+        raise Exception("Cannot delete objectdb key!")
+    key = property(__key_get, __key_set, __key_del)
 
     # name property (alias to self.key)
     def __name_get(self): return self.key
diff --git a/src/utils/idmapper/base.py b/src/utils/idmapper/base.py
index d0d1b3bb3c..ad17defb7c 100755
--- a/src/utils/idmapper/base.py
+++ b/src/utils/idmapper/base.py
@@ -127,7 +127,6 @@ class SharedMemoryModelBase(ModelBase):
             fset = lambda cls, val: _set(cls, fieldname, val)
             fdel = lambda cls: _del(cls, fieldname)
             doc = "Wraps setting, saving and deleting the %s field." % fieldname
-
             type(cls).__setattr__(cls, wrappername, property(fget, fset, fdel, doc))
 
         # exclude some models that should not auto-create wrapper fields