[#2977] Import config from ckan.common instead of pylons.

ckan/lib/jobs.py

@@ -20,14 +20,14 @@
 
 import logging
 
-from pylons import config
 import rq
 from rq.connections import push_connection
 from rq.exceptions import NoSuchJobError
 from rq.job import Job
 from rq.utils import ensure_list
 
 from ckan.lib.redis import connect_to_redis
+from ckan.common import config
 
 
 log = logging.getLogger(__name__)

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__)
 

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__)
 

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):

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 <ckan_redis_url>`: