X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=m_librarian%2Fconfig.py;h=2540ac463097408de93019713243c4e56d6c78c0;hb=061a45aba1f91ec167eb9ac283a4c0a0afb52798;hp=d896bf58cdb3c3d3d3c1ba9326690b3a1ed84856;hpb=2792dae0b23c3fe2f982651cdb31db622615ec81;p=m_librarian.git diff --git a/m_librarian/config.py b/m_librarian/config.py index d896bf5..2540ac4 100755 --- a/m_librarian/config.py +++ b/m_librarian/config.py @@ -1,7 +1,8 @@ #! /usr/bin/env python +from __future__ import print_function import os -from ConfigParser import SafeConfigParser +from ConfigParser import RawConfigParser __all__ = ['get_config'] @@ -38,20 +39,20 @@ def find_config_file(config_dirs=None): _ml_config = None -def get_config(config_filename=None): +def get_config(config_path=None): global _ml_config if _ml_config is None: - if config_filename is None: - config_filename = find_config_file() - _ml_config = SafeConfigParser() - _ml_config.read(config_filename) + if config_path is None: + config_path = find_config_file() + _ml_config = RawConfigParser() + _ml_config.read(config_path) return _ml_config def test(): config_dirs = find_config_dirs() - print "Config dirs:", config_dirs - print "Config file:", find_config_file(config_dirs) + print("Config dirs:", config_dirs) + print("Config file:", find_config_file(config_dirs)) if __name__ == '__main__': test()