X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=m_librarian%2Fconfig.py;h=a6b88f01091dc0539053089c72d3aed2bb1f0e8b;hb=9305df13fd2c3a935b2de82a28eea4cb6989e8e8;hp=9fff40781d63a58db98004704c0c2aa6deeac1d0;hpb=63bb5df8cf2595bbe106031911666fb7061a03aa;p=m_librarian.git diff --git a/m_librarian/config.py b/m_librarian/config.py index 9fff407..a6b88f0 100755 --- a/m_librarian/config.py +++ b/m_librarian/config.py @@ -29,11 +29,11 @@ def find_config_dirs(): return None -def find_config_file(config_dirs=None): +def find_config_file(config_dirs=None, config_filename='m_librarian.conf'): if config_dirs is None: config_dirs = find_config_dirs() for d in config_dirs: - ml_conf_file = os.path.join(d, 'm_librarian.conf') + ml_conf_file = os.path.join(d, config_filename) if os.path.exists(ml_conf_file): return ml_conf_file else: @@ -63,6 +63,14 @@ class ConfigWrapper(object): return default # Do not catch ValueError here, it must be propagated + def getlist(self, section, option, default=None, sep=None): + value = self.get(section, option) + if not value: + if default is None: + return [] + return default + return value.split(sep) + def getpath(self, section, option, default=os.path.curdir): path = self.get(section, option, default=default) return os.path.expanduser(os.path.expandvars(path))