itdominator
/
terminator
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refactor save() a little to reduce the branch complexity, and tidy up some other parts to appease pylint

This commit is contained in:
Chris Jones 2010-01-22 18:54:36 +00:00
parent 9ef6122a97
commit ff56fedcf0
1 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
terminatorlib/config.py
View File

@ -63,7 +63,6 @@ Classes relating to configuration
import platform import platform
import os import os
import sys
from copy import copy from copy import copy
from configobj.configobj import ConfigObj, flatten_errors from configobj.configobj import ConfigObj, flatten_errors
from configobj.validate import Validator from configobj.validate import Validator
@ -358,16 +357,18 @@ class ConfigBase(Borg):
specification""" specification"""
configspecdata = {} configspecdata = {}
keymap = {
'int': 'integer',
'str': 'string',
'bool': 'boolean',
}
section = {} section = {}
for key in DEFAULTS['global_config']: for key in DEFAULTS['global_config']:
keytype = DEFAULTS['global_config'][key].__class__.__name__ keytype = DEFAULTS['global_config'][key].__class__.__name__
value = DEFAULTS['global_config'][key] value = DEFAULTS['global_config'][key]
if keytype == 'int': if keytype in keymap:
keytype = 'integer' keytype = keymap[keytype]
elif keytype == 'str':
keytype = 'string'
elif keytype == 'bool':
keytype = 'boolean'
elif keytype == 'list': elif keytype == 'list':
value = 'list(%s)' % ','.join(value) value = 'list(%s)' % ','.join(value)
@ -388,15 +389,12 @@ class ConfigBase(Borg):
for key in DEFAULTS['profiles']['default']: for key in DEFAULTS['profiles']['default']:
keytype = DEFAULTS['profiles']['default'][key].__class__.__name__ keytype = DEFAULTS['profiles']['default'][key].__class__.__name__
value = DEFAULTS['profiles']['default'][key] value = DEFAULTS['profiles']['default'][key]
if keytype == 'int': if keytype in keymap:
keytype = 'integer' keytype = keymap[keytype]
elif keytype == 'bool':
keytype = 'boolean'
elif keytype == 'str':
keytype = 'string'
value = '"%s"' % value
elif keytype == 'list': elif keytype == 'list':
value = 'list(%s)' % ','.join(value) value = 'list(%s)' % ','.join(value)
if keytype == 'string':
value = '"%s"' % value
keytype = '%s(default=%s)' % (keytype, value) keytype = '%s(default=%s)' % (keytype, value)
@ -429,7 +427,7 @@ class ConfigBase(Borg):
if result != True: if result != True:
err('ConfigBase::load: config format is not valid') err('ConfigBase::load: config format is not valid')
for (section_list, key, other) in flatten_errors(parser, result): for (section_list, key, _other) in flatten_errors(parser, result):
if key is not None: if key is not None:
print('[%s]: %s is invalid' % (','.join(section_list), key)) print('[%s]: %s is invalid' % (','.join(section_list), key))
else: else:
@ -453,7 +451,7 @@ class ConfigBase(Borg):
try: try:
section.update(parser[section_name]) section.update(parser[section_name])
except KeyError, ex: except KeyError, ex:
dbg('ConfigBase::load: skipping loading missing section %s' % dbg('ConfigBase::load: skipping missing section %s' %
section_name) section_name)
self.loaded = True self.loaded = True
@ -472,8 +470,8 @@ class ConfigBase(Borg):
parser['profiles'] = {} parser['profiles'] = {}
for profile in self.profiles: for profile in self.profiles:
dbg('ConfigBase::save: Processing profile: %s' % profile) dbg('ConfigBase::save: Processing profile: %s' % profile)
parser['profiles'][profile] = dict_diff(DEFAULTS['profiles']['default'], parser['profiles'][profile] = dict_diff(
self.profiles[profile]) DEFAULTS['profiles']['default'], self.profiles[profile])
parser['layouts'] = {} parser['layouts'] = {}
for layout in self.layouts: for layout in self.layouts:
@ -548,8 +546,3 @@ class ConfigBase(Borg):
self.profiles[profile] = copy(DEFAULTS['profiles']['default']) self.profiles[profile] = copy(DEFAULTS['profiles']['default'])
return(True) return(True)
if __name__ == '__main__':
import doctest
(failed, attempted) = doctest.testmod()
print "%d/%d tests failed" % (failed, attempted)
sys.exit(failed)