nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

store 'ROOT' special section in a constant

Browse source
This commit is contained in:
Romain Bignon 2010-11-14 21:47:43 +01:00
commit d42ac3ea0d
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
weboob/tools/config/iniconfig.py
View file

@ -30,6 +30,8 @@ __all__ = ['INIConfig']
class INIConfig(IConfig): class INIConfig(IConfig):
ROOTSECT = 'ROOT'
def __init__(self, path): def __init__(self, path):
self.path = path self.path = path
self.values = OrderedDict() self.values = OrderedDict()
@ -42,17 +44,17 @@ class INIConfig(IConfig):
self.config.read(self.path) self.config.read(self.path)
for section in self.config.sections(): for section in self.config.sections():
args = section.split(':') args = section.split(':')
if args[0] == 'ROOT': if args[0] == self.ROOTSECT:
args.pop(0) args.pop(0)
for key, value in self.config.items(section): for key, value in self.config.items(section):
self.set(*(args + [key, value])) self.set(*(args + [key, value]))
# retro compatibility # retro compatibility
if len(self.config.sections()) == 0: if len(self.config.sections()) == 0:
first = True first = True
for key, value in self.config.items('DEFAULT'): for key, value in self.config.items(DEFAULTSECT):
if first: if first:
logging.warning('The configuration file "%s" uses an old-style' % self.path) logging.warning('The configuration file "%s" uses an old-style' % self.path)
logging.warning('Please rename the DEFAULT section to ROOT') logging.warning('Please rename the %s section to %s' % (DEFAULTSECT, self.ROOTSECT))
first = False first = False
self.set(key, value) self.set(key, value)
logging.debug(u'Application configuration file loaded: %s.' % self.path) logging.debug(u'Application configuration file loaded: %s.' % self.path)
@ -63,14 +65,14 @@ class INIConfig(IConfig):
return self.values return self.values
def save(self): def save(self):
def save_section(values, root_section='ROOT'): def save_section(values, root_section=self.ROOTSECT):
for k, v in values.iteritems(): for k, v in values.iteritems():
if isinstance(v, (int, float, basestring)): if isinstance(v, (int, float, basestring)):
if not self.config.has_section(root_section): if not self.config.has_section(root_section):
self.config.add_section(root_section) self.config.add_section(root_section)
self.config.set(root_section, k, unicode(v)) self.config.set(root_section, k, unicode(v))
elif isinstance(v, dict): elif isinstance(v, dict):
new_section = ':'.join((root_section, k)) if (root_section != 'ROOT' or k == 'ROOT') else k new_section = ':'.join((root_section, k)) if (root_section != self.ROOTSECT or k == self.ROOTSECT) else k
if not self.config.has_section(new_section): if not self.config.has_section(new_section):
self.config.add_section(new_section) self.config.add_section(new_section)
save_section(v, new_section) save_section(v, new_section)