Move BugDir, Bug, and Comment to new _setup_saved_settings

diff --git a/libbe/bug.py b/libbe/bug.py
index 275a8269e8ad2d75587b77e2132aae0925533480..0b40921befaf6c08c63164669f435fc2514f7fe6 100644 (file)
--- a/libbe/bug.py
+++ b/libbe/bug.py
@@ -121,7 +121,7 @@ def load_status(active_status_def, inactive_status_def):
 load_status(active_status_def, inactive_status_def)
 
 
-class Bug(settings_object.SavedSettingsObject):
+class Bug (settings_object.SavedSettingsObject):
     """
     >>> b = Bug()
     >>> print b.status
@@ -628,11 +628,11 @@ class Bug(settings_object.SavedSettingsObject):
             settings_mapfile = \
                 self.storage.get(self.id.storage('values'), default='\n')
         try:
-            self.settings = mapfile.parse(settings_mapfile)
+            settings = mapfile.parse(settings_mapfile)
         except mapfile.InvalidMapfileContents, e:
             raise Exception('Invalid settings file for bug %s\n'
                             '(BE version missmatch?)' % self.id.user())
-        self._setup_saved_settings()
+        self._setup_saved_settings(settings)
 
     def save_settings(self):
         mf = mapfile.generate(self._get_saved_settings())

diff --git a/libbe/bugdir.py b/libbe/bugdir.py
index 30c9ef3bce55ad2a41864bd7032f5acab027562d..dd467bf45b4c4f2f47b9568f6a08d724c079f446 100644 (file)
--- a/libbe/bugdir.py
+++ b/libbe/bugdir.py
@@ -191,11 +191,11 @@ class BugDir (list, settings_object.SavedSettingsObject):
             settings_mapfile = \
                 self.storage.get(self.id.storage('settings'), default='\n')
         try:
-            self.settings = mapfile.parse(settings_mapfile)
+            settings = mapfile.parse(settings_mapfile)
         except mapfile.InvalidMapfileContents, e:
             raise Exception('Invalid settings file for bugdir %s\n'
                             '(BE version missmatch?)' % self.id.user())
-        self._setup_saved_settings()
+        self._setup_saved_settings(settings)
         self._setup_severities(self.severities)
         self._setup_status(self.active_status, self.inactive_status)
 

diff --git a/libbe/comment.py b/libbe/comment.py
index f1b979ec4d179cf1ba77b5972ed5ff77e2811ab7..accd4df28c2bc93ce03dc3d7ca008421bb3e9abb 100644 (file)
--- a/libbe/comment.py
+++ b/libbe/comment.py
@@ -93,7 +93,7 @@ def save_comments(bug):
         comment.save()
 
 
-class Comment(Tree, settings_object.SavedSettingsObject):
+class Comment (Tree, settings_object.SavedSettingsObject):
     """
     >>> c = Comment()
     >>> c.uuid != None
@@ -587,11 +587,11 @@ class Comment(Tree, settings_object.SavedSettingsObject):
             settings_mapfile = \
                 self.storage.get(self.id.storage("values"), default="\n")
         try:
-            self.settings = mapfile.parse(settings_mapfile)
+            settings = mapfile.parse(settings_mapfile)
         except mapfile.InvalidMapfileContents, e:
             raise Exception('Invalid settings file for comment %s\n'
                             '(BE version missmatch?)' % self.id.user())
-        self._setup_saved_settings()
+        self._setup_saved_settings(settings)
 
     def save_settings(self):
         mf = mapfile.generate(self._get_saved_settings())