diff options
Diffstat (limited to 'module/config')
-rw-r--r-- | module/config/ConfigParser.py | 7 | ||||
-rw-r--r-- | module/config/converter.py | 26 |
2 files changed, 3 insertions, 30 deletions
diff --git a/module/config/ConfigParser.py b/module/config/ConfigParser.py index d7ecab5a0..a9e74dd20 100644 --- a/module/config/ConfigParser.py +++ b/module/config/ConfigParser.py @@ -4,15 +4,14 @@ from __future__ import with_statement from time import sleep from os.path import exists from gettext import gettext +from new_collections import namedtuple, OrderedDict +from module.utils import from_string from module.utils.fs import chmod -CONF_VERSION = 2 - -from converter import from_string -from new_collections import namedtuple, OrderedDict from default import make_config +CONF_VERSION = 2 SectionTuple = namedtuple("SectionTuple", "name description long_desc config") ConfigData = namedtuple("ConfigData", "name type description default") diff --git a/module/config/converter.py b/module/config/converter.py deleted file mode 100644 index f3b4dc327..000000000 --- a/module/config/converter.py +++ /dev/null @@ -1,26 +0,0 @@ -# -*- coding: utf-8 -*- - -from module.utils import decode - -def to_string(value): - return str(value) if not isinstance(value, basestring) else value - -# cast value to given type, unicode for strings -def from_string(value, typ=None): - - # value is no string - if not isinstance(value, basestring): - return value - - value = decode(value) - - if typ == "int": - return int(value) - elif typ == "bool": - return True if value.lower() in ("1", "true", "on", "an", "yes") else False - elif typ == "time": - if not value: value = "0:00" - if not ":" in value: value += ":00" - return value - else: - return value
\ No newline at end of file |