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

use OrderedDict and fix parsing of path-like in INI files

Browse source
This commit is contained in:
Romain Bignon 2010-11-14 14:11:38 +01:00
commit 9a5b726013
1 changed files with 23 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -18,10 +18,11 @@
from __future__ import with_statement from __future__ import with_statement
from ConfigParser import SafeConfigParser from ConfigParser import RawConfigParser, DEFAULTSECT
import logging import logging
import os import os
from weboob.tools.ordereddict import OrderedDict
from .iconfig import IConfig from .iconfig import IConfig
@ -31,27 +32,29 @@ __all__ = ['INIConfig']
class INIConfig(IConfig): class INIConfig(IConfig):
def __init__(self, path): def __init__(self, path):
self.path = path self.path = path
self.values = {} self.values = OrderedDict()
self.config = SafeConfigParser() self.config = RawConfigParser()
def load(self, default={}): def load(self, default={}):
def load_section(section): self.values = OrderedDict(default)
sections = section.split(':')
if len(sections) > 1:
result = {}
for s in sections:
result[s] = load_section(s)
return result
else:
return {section: dict(self.config.items(section))}
self.values = default.copy()
if os.path.exists(self.path): if os.path.exists(self.path):
self.config.read(self.path) self.config.read(self.path)
for section in self.config.sections(): for section in self.config.sections():
self.values = load_section(section) args = section.split(':')
self.values.update(self.config.items('DEFAULT')) if args[0] == 'ROOT':
args.pop(0)
for key, value in self.config.items(section):
self.set(*(args + [key, value]))
# retro compatibility
if len(self.config.sections()) == 0:
first = True
for key, value in self.config.items('DEFAULT'):
if first:
logging.warning('The configuration file "%s" uses an old-style' % self.path)
logging.warning('Please rename the DEFAULT section to ROOT')
first = False
self.set(key, value)
logging.debug(u'Application configuration file loaded: %s.' % self.path) logging.debug(u'Application configuration file loaded: %s.' % self.path)
else: else:
self.save() self.save()
@ -60,14 +63,14 @@ class INIConfig(IConfig):
return self.values return self.values
def save(self): def save(self):
def save_section(values, root_section=None): def save_section(values, root_section='ROOT'):
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 root_section is not None and 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 else k new_section = ':'.join((root_section, k)) if (root_section != 'ROOT' or k == 'ROOT') 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)
@ -95,7 +98,7 @@ class INIConfig(IConfig):
v = self.values v = self.values
for k in args[:-2]: for k in args[:-2]:
if k not in v: if k not in v:
v[k] = {} v[k] = OrderedDict()
v = v[k] v = v[k]
v[args[-2]] = args[-1] v[args[-2]] = args[-1]