From 7483164274a88a201c51170b0b88fea04cb1e62b Mon Sep 17 00:00:00 2001 From: amercader Date: Thu, 25 Aug 2016 14:03:07 +0100 Subject: [PATCH] [#2842] Fix some remainig direct pylons config imports --- ckan/config/routing.py | 2 +- ckan/lib/render.py | 2 +- ckanext/example_theme/custom_config_setting/plugin.py | 2 +- ckanext/example_theme/custom_emails/tests.py | 2 +- ckanext/reclineview/plugin.py | 3 +-- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/ckan/config/routing.py b/ckan/config/routing.py index c5f12df9f7c..03aa50f625b 100644 --- a/ckan/config/routing.py +++ b/ckan/config/routing.py @@ -9,10 +9,10 @@ """ import re -from pylons import config from routes.mapper import SubMapper, Mapper as _Mapper import ckan.plugins as p +from ckan.common import config named_routes = {} diff --git a/ckan/lib/render.py b/ckan/lib/render.py index fa2507c2192..c22c35680d1 100644 --- a/ckan/lib/render.py +++ b/ckan/lib/render.py @@ -4,7 +4,7 @@ import re import logging -from pylons import config +from ckan.common import config log = logging.getLogger(__name__) diff --git a/ckanext/example_theme/custom_config_setting/plugin.py b/ckanext/example_theme/custom_config_setting/plugin.py index 74439633949..c89f4e6296f 100644 --- a/ckanext/example_theme/custom_config_setting/plugin.py +++ b/ckanext/example_theme/custom_config_setting/plugin.py @@ -1,9 +1,9 @@ # encoding: utf-8 -import pylons.config as config import ckan.plugins as plugins import ckan.plugins.toolkit as toolkit +from ckan.common import config def show_most_popular_groups(): diff --git a/ckanext/example_theme/custom_emails/tests.py b/ckanext/example_theme/custom_emails/tests.py index 5c72852d15a..66a095e4590 100644 --- a/ckanext/example_theme/custom_emails/tests.py +++ b/ckanext/example_theme/custom_emails/tests.py @@ -1,12 +1,12 @@ # encoding: utf-8 import os -from pylons import config from ckan import plugins import ckan.model as model import ckan.lib.mailer as mailer from ckan.tests import factories from ckan.lib.base import render_jinja2 +from ckan.common import config from ckan.tests.lib.test_mailer import MailerBase import ckan.tests.helpers as helpers diff --git a/ckanext/reclineview/plugin.py b/ckanext/reclineview/plugin.py index 6320acc25e2..d6ac44f2b98 100644 --- a/ckanext/reclineview/plugin.py +++ b/ckanext/reclineview/plugin.py @@ -2,10 +2,9 @@ from logging import getLogger -from ckan.common import json +from ckan.common import json, config import ckan.plugins as p import ckan.plugins.toolkit as toolkit -from pylons import config log = getLogger(__name__) ignore_empty = p.toolkit.get_validator('ignore_empty')