From 4e015d93a56a7fd95a5daa6ad2b60038e9f1558e Mon Sep 17 00:00:00 2001 From: amercader Date: Fri, 20 Dec 2019 12:40:32 +0100 Subject: [PATCH] [#4801] Use load_config from new CLI, support expanding user name --- ckan/cli/__init__.py | 9 ++++++--- ckan/tests/pytest_ckan/ckan_setup.py | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ckan/cli/__init__.py b/ckan/cli/__init__.py index 281f52b6ac4..b792fe0f023 100644 --- a/ckan/cli/__init__.py +++ b/ckan/cli/__init__.py @@ -22,10 +22,13 @@ def error_shout(exception): ) -def load_config(config=None): +def load_config(ini_path=None): from paste.deploy import appconfig - if config: - filename = os.path.abspath(config) + + if ini_path: + if ini_path.startswith('~'): + ini_path = os.path.expanduser(ini_path) + filename = os.path.abspath(ini_path) config_source = u'-c parameter' elif os.environ.get(u'CKAN_INI'): filename = os.environ.get(u'CKAN_INI') diff --git a/ckan/tests/pytest_ckan/ckan_setup.py b/ckan/tests/pytest_ckan/ckan_setup.py index 6cd29a12887..1bddb9dc269 100644 --- a/ckan/tests/pytest_ckan/ckan_setup.py +++ b/ckan/tests/pytest_ckan/ckan_setup.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from ckan.lib.cli import load_config +from ckan.cli import load_config def pytest_addoption(parser):