X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=m_librarian%2Fconfig.py;h=4abed14ebc699d430f02cd0940abd5754c358c96;hb=f5f7e40267b3e58f4999c4b00a7b8802e2021958;hp=ca7eadd4fa95a168979c99672d3b6766ac6b19aa;hpb=76fad1db9bf3d812333ca9f65b1ed87c8549cab7;p=m_librarian.git diff --git a/m_librarian/config.py b/m_librarian/config.py index ca7eadd..4abed14 100755 --- a/m_librarian/config.py +++ b/m_librarian/config.py @@ -1,7 +1,11 @@ #! /usr/bin/env python +from __future__ import print_function import os -from ConfigParser import RawConfigParser +try: + from ConfigParser import RawConfigParser +except ImportError: # py3 + from configparser import RawConfigParser __all__ = ['get_config'] @@ -38,20 +42,21 @@ 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() + if config_path is None: + config_path = find_config_file() _ml_config = RawConfigParser() - _ml_config.read(config_filename) + _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()