Merge from DBenoy's branch.

src/help/models.py

@@ -45,7 +45,7 @@ class HelpEntry(SharedMemoryModel):
     # These database fields are all set using their corresponding properties,
     # named same as the field, but withtout the db_* prefix.
 
-    # title of the help
+    # title of the help entry
     db_key = models.CharField('help key', max_length=255, unique=True, help_text='key to search for')
     # help category
     db_help_category = models.CharField("help category", max_length=255, default="General",
@@ -72,9 +72,6 @@ class HelpEntry(SharedMemoryModel):
         verbose_name = "Help Entry"
         verbose_name_plural = "Help Entries"
 
-    # used by Attributes to safely retrieve stored object
-    _db_model_name = "helpentry"
-
     # Wrapper properties to easily set database fields. These are
     # @property decorators that allows to access these fields using
     # normal python operations (without having to remember to save()
@@ -85,53 +82,53 @@ class HelpEntry(SharedMemoryModel):
 
     # key property (wraps db_key)
     #@property
-    def __key_get(self):
-        "Getter. Allows for value = self.key"
-        return self.db_key
-    #@key.setter
-    def __key_set(self, value):
-        "Setter. Allows for self.key = value"
-        self.db_key = value
-        self.save()
-    #@key.deleter
-    def __key_del(self):
-        "Deleter. Allows for del self.key. Deletes entry."
-        self.delete()
-    key = property(__key_get, __key_set, __key_del)
+    #def __key_get(self):
+    #    "Getter. Allows for value = self.key"
+    #    return self.db_key
+    ##@key.setter
+    #def __key_set(self, value):
+    #    "Setter. Allows for self.key = value"
+    #    self.db_key = value
+    #    self.save()
+    ##@key.deleter
+    #def __key_del(self):
+    #    "Deleter. Allows for del self.key. Deletes entry."
+    #    self.delete()
+    #key = property(__key_get, __key_set, __key_del)
 
-    # help_category property (wraps db_help_category)
-    #@property
-    def __help_category_get(self):
-        "Getter. Allows for value = self.help_category"
-        return self.db_help_category
-    #@help_category.setter
-    def __help_category_set(self, value):
-        "Setter. Allows for self.help_category = value"
-        self.db_help_category = value
-        self.save()
-    #@help_category.deleter
-    def __help_category_del(self):
-        "Deleter. Allows for del self.help_category"
-        self.db_help_category = "General"
-        self.save()
-    help_category = property(__help_category_get, __help_category_set, __help_category_del)
+    ## help_category property (wraps db_help_category)
+    ##@property
+    #def __help_category_get(self):
+    #    "Getter. Allows for value = self.help_category"
+    #    return self.db_help_category
+    ##@help_category.setter
+    #def __help_category_set(self, value):
+    #    "Setter. Allows for self.help_category = value"
+    #    self.db_help_category = value
+    #    self.save()
+    ##@help_category.deleter
+    #def __help_category_del(self):
+    #    "Deleter. Allows for del self.help_category"
+    #    self.db_help_category = "General"
+    #    self.save()
+    #help_category = property(__help_category_get, __help_category_set, __help_category_del)
 
-    # entrytext property (wraps db_entrytext)
-    #@property
-    def __entrytext_get(self):
-        "Getter. Allows for value = self.entrytext"
-        return self.db_entrytext
-    #@entrytext.setter
-    def __entrytext_set(self, value):
-        "Setter. Allows for self.entrytext = value"
-        self.db_entrytext = value
-        self.save()
-    #@entrytext.deleter
-    def __entrytext_del(self):
-        "Deleter. Allows for del self.entrytext"
-        self.db_entrytext = ""
-        self.save()
-    entrytext = property(__entrytext_get, __entrytext_set, __entrytext_del)
+    ## entrytext property (wraps db_entrytext)
+    ##@property
+    #def __entrytext_get(self):
+    #    "Getter. Allows for value = self.entrytext"
+    #    return self.db_entrytext
+    ##@entrytext.setter
+    #def __entrytext_set(self, value):
+    #    "Setter. Allows for self.entrytext = value"
+    #    self.db_entrytext = value
+    #    self.save()
+    ##@entrytext.deleter
+    #def __entrytext_del(self):
+    #    "Deleter. Allows for del self.entrytext"
+    #    self.db_entrytext = ""
+    #    self.save()
+    #entrytext = property(__entrytext_get, __entrytext_set, __entrytext_del)
 
     # permissions property
     #@property
@@ -153,20 +150,20 @@ class HelpEntry(SharedMemoryModel):
     permissions = property(__permissions_get, __permissions_set, __permissions_del)
 
         # lock_storage property (wraps db_lock_storage)
-    #@property
-    def __lock_storage_get(self):
-        "Getter. Allows for value = self.lock_storage"
-        return self.db_lock_storage
-    #@nick.setter
-    def __lock_storage_set(self, value):
-        """Saves the lock_storagetodate. This is usually not called directly, but through self.lock()"""
-        self.db_lock_storage = value
-        self.save()
-    #@nick.deleter
-    def __lock_storage_del(self):
-        "Deleter is disabled. Use the lockhandler.delete (self.lock.delete) instead"""
-        logger.log_errmsg("Lock_Storage (on %s) cannot be deleted. Use obj.lock.delete() instead." % self)
-    lock_storage = property(__lock_storage_get, __lock_storage_set, __lock_storage_del)
+    ##@property
+    #def __lock_storage_get(self):
+    #    "Getter. Allows for value = self.lock_storage"
+    #    return self.db_lock_storage
+    ##@nick.setter
+    #def __lock_storage_set(self, value):
+    #    """Saves the lock_storagetodate. This is usually not called directly, but through self.lock()"""
+    #    self.db_lock_storage = value
+    #    self.save()
+    ##@nick.deleter
+    #def __lock_storage_del(self):
+    #    "Deleter is disabled. Use the lockhandler.delete (self.lock.delete) instead"""
+    #    logger.log_errmsg("Lock_Storage (on %s) cannot be deleted. Use obj.lock.delete() instead." % self)
+    #lock_storage = property(__lock_storage_get, __lock_storage_set, __lock_storage_del)
 
 
     #