Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed order issue for 3rd-party config; fixed a reset bug; added more tests

Browse Source 
svn: r13348
This commit is contained in:
Doug Blank
2009-10-08 05:09:08 +00:00
parent 9d8ff1bacf
commit 4abfc5d39d
1 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/config.py
View File

@ -121,16 +121,24 @@ class ConfigManager(object):
self.data = {} self.data = {}
self.reset() self.reset()
def reset(self, section=None): def reset(self, section=None, setting=None):
""" """
Resets all settings values to their defaults. Resets one, a section, or all settings values to their defaults.
""" """
if section is not None and "." in section:
section, setting = section.split(".", 1)
if section is None: if section is None:
self.data = {} self.data = {}
self.data.update(self.default) for section in self.default:
else: self.data[section] = {}
for setting in self.default[section]:
self.data[section][setting] = self.default[section][setting]
elif setting is None:
self.data[section] = {} self.data[section] = {}
self.data[section].update(self.default[section]) for setting in self.default[section]:
self.data[section][setting] = self.default[section][setting]
else:
self.data[section][setting] = self.default[section][setting]
# Callbacks are still connected # Callbacks are still connected
def get_sections(self): def get_sections(self):
@ -183,11 +191,15 @@ class ConfigManager(object):
else: else:
value = eval_item(setting) value = eval_item(setting)
####################### Now, let's test and set: ####################### Now, let's test and set:
if type(value) == type(self.default[name][opt.lower()]): if opt.lower() in self.default[name]:
self.data[name][opt.lower()] = value if type(value) == type(self.default[name][opt.lower()]):
self.data[name][opt.lower()] = value
else:
print ("WARNING: ignoring key with wrong type '%s.%s'"
% (name, opt.lower()))
else: else:
print ("WARNING: ignoring key with wrong type '%s.%s'" # this could be a third-party setting; add it:
% (name, opt.lower())) self.data[name][opt.lower()] = value
def save(self, filename = None): def save(self, filename = None):
""" """
@ -705,4 +717,7 @@ if __name__ == "__main__":
CM.set("section.setting1", -1) CM.set("section.setting1", -1)
assert x == "1024" assert x == "1024"
CM.reset("section.setting1")
assert CM.get("section.setting1") == 1
CM.save("./test2.ini") CM.save("./test2.ini")