diff options
| author | W. Trevor King <wking@drexel.edu> | 2009-07-27 07:47:35 -0400 |
|---|---|---|
| committer | W. Trevor King <wking@drexel.edu> | 2009-07-27 07:47:35 -0400 |
| commit | 0cacaf8809ade66e595361b30290234be3a6d8b0 (patch) | |
| tree | 910ea2aa7aae8e197f9dadf00334fd7384e88e67 /libbe/settings_object.py | |
| parent | 2cc6145453fd50fb034e7578362159484ab8e6e7 (diff) | |
| download | bugseverywhere-0cacaf8809ade66e595361b30290234be3a6d8b0.tar.gz | |
Added default to settings_object.versioned_property's change_hook_property.
Now change_hook properties handle defaults, which allows them to avoid
an initial
None -> default
save hook trigger.
Removed the now-redundant read-only mode business in
becommands/diff.py.
Diffstat (limited to 'libbe/settings_object.py')
| -rw-r--r-- | libbe/settings_object.py | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/libbe/settings_object.py b/libbe/settings_object.py index dde247f..ceea9d5 100644 --- a/libbe/settings_object.py +++ b/libbe/settings_object.py @@ -148,7 +148,8 @@ def versioned_property(name, doc, checked = checked_property(allowed=allowed) fulldoc += "\n\nThe allowed values for this property are: %s." \ % (', '.join(allowed)) - hooked = change_hook_property(hook=change_hook, mutable=mutable) + hooked = change_hook_property(hook=change_hook, mutable=mutable, + default=EMPTY) primed = primed_property(primer=primer, initVal=UNPRIMED) settings = settings_property(name=name, null=UNPRIMED) docp = doc_property(doc=fulldoc) @@ -385,30 +386,24 @@ class SavedSettingsObjectTests(unittest.TestCase): self.failUnless(SAVES == [], SAVES) self.failUnless(t._settings_loaded == True, t._settings_loaded) self.failUnless(t.list_type == None, t.list_type) - self.failUnless(SAVES == [ - "'None' -> '<class 'libbe.settings_object.EMPTY'>'" - ], SAVES) + self.failUnless(SAVES == [], SAVES) self.failUnless(t.settings["List-type"]==EMPTY,t.settings["List-type"]) t.list_type = [] self.failUnless(t.settings["List-type"] == [], t.settings["List-type"]) self.failUnless(SAVES == [ - "'None' -> '<class 'libbe.settings_object.EMPTY'>'", "'<class 'libbe.settings_object.EMPTY'>' -> '[]'" ], SAVES) t.list_type.append(5) self.failUnless(SAVES == [ - "'None' -> '<class 'libbe.settings_object.EMPTY'>'", "'<class 'libbe.settings_object.EMPTY'>' -> '[]'", ], SAVES) self.failUnless(t.settings["List-type"] == [5],t.settings["List-type"]) self.failUnless(SAVES == [ # the append(5) has not yet been saved - "'None' -> '<class 'libbe.settings_object.EMPTY'>'", "'<class 'libbe.settings_object.EMPTY'>' -> '[]'", ], SAVES) self.failUnless(t.list_type == [5], t.list_type) # <-get triggers saved self.failUnless(SAVES == [ # now the append(5) has been saved. - "'None' -> '<class 'libbe.settings_object.EMPTY'>'", "'<class 'libbe.settings_object.EMPTY'>' -> '[]'", "'[]' -> '[5]'" ], SAVES) |