diff options
| author | MaZderMind <git@mazdermind.de> | 2016-09-26 20:42:07 +0200 |
|---|---|---|
| committer | MaZderMind <git@mazdermind.de> | 2016-09-26 20:42:07 +0200 |
| commit | 6e846c7081e242213cd70ceacfcff319e221942c (patch) | |
| tree | 9d037e9272e65aea06c74775b2af1eae2f50a46e /voctogui/lib/config.py | |
| parent | fbcbc3743e9179738244a96be54aa588e44314cb (diff) | |
| parent | 1972da7f6aa60d3cb3b68808d0381e37898665f3 (diff) | |
Merge branch 'pep8'
Diffstat (limited to 'voctogui/lib/config.py')
| -rw-r--r-- | voctogui/lib/config.py | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/voctogui/lib/config.py b/voctogui/lib/config.py index d4630bf..dc7c561 100644 --- a/voctogui/lib/config.py +++ b/voctogui/lib/config.py @@ -7,31 +7,35 @@ import lib.connection as Connection __all__ = ['Config'] + def getlist(self, section, option): - return [x.strip() for x in self.get(section, option).split(',')] + return [x.strip() for x in self.get(section, option).split(',')] + def fetchServerConfig(self): - log = logging.getLogger('Config') - log.info("reading server-config") + log = logging.getLogger('Config') + log.info("reading server-config") - server_config = Connection.fetchServerConfig() + server_config = Connection.fetchServerConfig() - log.info("merging server-config %s", server_config) - self.read_dict(server_config) + log.info("merging server-config %s", server_config) + self.read_dict(server_config) SafeConfigParser.getlist = getlist SafeConfigParser.fetchServerConfig = fetchServerConfig files = [ - os.path.join(os.path.dirname(os.path.realpath(__file__)), '../default-config.ini'), - os.path.join(os.path.dirname(os.path.realpath(__file__)), '../config.ini'), - '/etc/voctomix/voctogui.ini', - '/etc/voctogui.ini', - os.path.expanduser('~/.voctogui.ini'), + os.path.join(os.path.dirname(os.path.realpath(__file__)), + '../default-config.ini'), + os.path.join(os.path.dirname(os.path.realpath(__file__)), + '../config.ini'), + '/etc/voctomix/voctogui.ini', + '/etc/voctogui.ini', + os.path.expanduser('~/.voctogui.ini'), ] if Args.ini_file is not None: - files.append(Args.ini_file) + files.append(Args.ini_file) Config = SafeConfigParser() Config.read(files) |