diff --git a/ckan/lib/jobs.py b/ckan/lib/jobs.py index cd06bde46af..2f90ec57c77 100644 --- a/ckan/lib/jobs.py +++ b/ckan/lib/jobs.py @@ -20,7 +20,6 @@ import logging -from pylons import config import rq from rq.connections import push_connection from rq.exceptions import NoSuchJobError @@ -28,6 +27,7 @@ from rq.utils import ensure_list from ckan.lib.redis import connect_to_redis +from ckan.common import config log = logging.getLogger(__name__) diff --git a/ckan/lib/redis.py b/ckan/lib/redis.py index 77779bbcb4f..0e1c5f80d9b 100644 --- a/ckan/lib/redis.py +++ b/ckan/lib/redis.py @@ -11,9 +11,10 @@ import datetime import logging -from pylons import config from redis import ConnectionPool, Redis +from ckan.common import config + log = logging.getLogger(__name__) diff --git a/ckan/tests/lib/test_cli.py b/ckan/tests/lib/test_cli.py index 7d360284082..e94664687d4 100644 --- a/ckan/tests/lib/test_cli.py +++ b/ckan/tests/lib/test_cli.py @@ -10,12 +10,12 @@ from nose.tools import (assert_raises, eq_ as eq, ok_ as ok, assert_in, assert_not_in, assert_not_equal as neq, assert_false as nok) -from pylons import config from paste.script.command import run import ckan.lib.cli as cli import ckan.lib.jobs as jobs import ckan.tests.helpers as helpers +from ckan.common import config log = logging.getLogger(__name__) diff --git a/ckan/tests/lib/test_jobs.py b/ckan/tests/lib/test_jobs.py index ed842ffa4e7..b69e7ab3bd2 100644 --- a/ckan/tests/lib/test_jobs.py +++ b/ckan/tests/lib/test_jobs.py @@ -7,11 +7,11 @@ import datetime from nose.tools import ok_, assert_equal, raises -from pylons import config import rq import ckan.lib.jobs as jobs from ckan.tests.helpers import changed_config, recorded_logs, RQTestBase +from ckan.common import config class TestQueueNamePrefixes(RQTestBase): diff --git a/doc/extensions/best-practices.rst b/doc/extensions/best-practices.rst index d3ae992f04e..dcc27ff5608 100644 --- a/doc/extensions/best-practices.rst +++ b/doc/extensions/best-practices.rst @@ -87,7 +87,13 @@ the CKAN site ID, which is available via :: - from pylons import config + try: + # CKAN 2.7 and later + from ckan.common import config + except ImportError: + # CKAN 2.6 and earlier + from pylons import config + site_id = config[u'ckan.site_id'] Currently this only affects the :ref:`Redis database `: