From df4c2e0b2c08fa5b94fec0b94de10ed5fbe97f30 Mon Sep 17 00:00:00 2001 From: Marc Dutoo Date: Mon, 6 Dec 2021 18:34:39 +0100 Subject: [PATCH] Migrate to CKAN 2.9.4 & python 3.7, following process at ozwillo/ckanext-ozwillo-theme#8 --- ckanext/datarequests/actions.py | 8 ++++---- ckanext/datarequests/auth.py | 2 +- ckanext/datarequests/db.py | 2 +- ckanext/datarequests/helpers.py | 2 +- ckanext/datarequests/plugin.py | 10 +++++----- ckanext/datarequests/validator.py | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ckanext/datarequests/actions.py b/ckanext/datarequests/actions.py index f251084a..d02bd9e5 100644 --- a/ckanext/datarequests/actions.py +++ b/ckanext/datarequests/actions.py @@ -21,15 +21,15 @@ import ckan.lib.base as base import ckan.model as model import ckan.plugins as plugins -import constants +from . import constants import datetime import cgi -import db +from . import db import logging -import validator +from . import validator import ckan.lib.mailer as mailer -from pylons import config +from ckan.plugins.toolkit import config c = plugins.toolkit.c log = logging.getLogger(__name__) diff --git a/ckanext/datarequests/auth.py b/ckanext/datarequests/auth.py index ed231fc6..8fcbd336 100644 --- a/ckanext/datarequests/auth.py +++ b/ckanext/datarequests/auth.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU Affero General Public License # along with CKAN Data Requests Extension. If not, see . -import constants +from . import constants from ckan.plugins import toolkit as tk diff --git a/ckanext/datarequests/db.py b/ckanext/datarequests/db.py index 1f36ac91..dd168ee1 100644 --- a/ckanext/datarequests/db.py +++ b/ckanext/datarequests/db.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU Affero General Public License # along with CKAN Data Requests Extension. If not, see . -import constants +from . import constants import sqlalchemy as sa import uuid diff --git a/ckanext/datarequests/helpers.py b/ckanext/datarequests/helpers.py index d6c7787f..e0073725 100644 --- a/ckanext/datarequests/helpers.py +++ b/ckanext/datarequests/helpers.py @@ -19,7 +19,7 @@ import ckan.model as model import ckan.plugins.toolkit as tk -import db +from . import db from ckan.common import c diff --git a/ckanext/datarequests/plugin.py b/ckanext/datarequests/plugin.py index d2c78c3a..d6227744 100644 --- a/ckanext/datarequests/plugin.py +++ b/ckanext/datarequests/plugin.py @@ -20,15 +20,15 @@ import ckan.lib.helpers as h import ckan.plugins as p import ckan.plugins.toolkit as tk -import auth -import actions -import constants -import helpers +from . import auth +from . import actions +from . import constants +from . import helpers import os import sys from functools import partial -from pylons import config +from ckan.plugins.toolkit import config def get_config_bool_value(config_name, default_value=False): diff --git a/ckanext/datarequests/validator.py b/ckanext/datarequests/validator.py index b195f6b7..d903c5ae 100644 --- a/ckanext/datarequests/validator.py +++ b/ckanext/datarequests/validator.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU Affero General Public License # along with CKAN Data Requests Extension. If not, see . -import constants +from . import constants import ckan.plugins.toolkit as tk import ckanext.datarequests.db as db