From fef11b9f197ecdfa3ba36a0c72d2fd4375c7b43a Mon Sep 17 00:00:00 2001 From: Dominik Moritz Date: Sun, 25 Nov 2012 14:08:18 +0100 Subject: [PATCH] clean up import --- ckanext/jsonpreview/plugin.py | 7 +++---- ckanext/pdfpreview/plugin.py | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/ckanext/jsonpreview/plugin.py b/ckanext/jsonpreview/plugin.py index 61df27d8176..11d5122ad26 100644 --- a/ckanext/jsonpreview/plugin.py +++ b/ckanext/jsonpreview/plugin.py @@ -2,7 +2,6 @@ from logging import getLogger import ckan.plugins as p -import ckan.plugins.toolkit as toolkit import ckan.lib.base as base log = getLogger(__name__) @@ -32,9 +31,9 @@ def update_config(self, config): ''' Set up the resource library, public directory and template directory for the preview ''' - toolkit.add_public_directory(config, 'theme/public') - toolkit.add_template_directory(config, 'theme/templates') - toolkit.add_resource('theme/public', 'ckanext-jsonpreview') + p.toolkit.add_public_directory(config, 'theme/public') + p.toolkit.add_template_directory(config, 'theme/templates') + p.toolkit.add_resource('theme/public', 'ckanext-jsonpreview') def proxy_enabled(self): return pylons.config.get('ckan.resource_proxy_enabled', False) diff --git a/ckanext/pdfpreview/plugin.py b/ckanext/pdfpreview/plugin.py index 6f40628243b..bb83a07c9a9 100644 --- a/ckanext/pdfpreview/plugin.py +++ b/ckanext/pdfpreview/plugin.py @@ -1,7 +1,6 @@ from logging import getLogger import ckan.plugins as p -import ckan.plugins.toolkit as toolkit import ckan.lib.base as base log = getLogger(__name__) @@ -30,9 +29,9 @@ def update_config(self, config): ''' Set up the resource library, public directory and template directory for the preview ''' - toolkit.add_public_directory(config, 'theme/public') - toolkit.add_template_directory(config, 'theme/templates') - toolkit.add_resource('theme/public', 'ckanext-pdfpreview') + p.toolkit.add_public_directory(config, 'theme/public') + p.toolkit.add_template_directory(config, 'theme/templates') + p.toolkit.add_resource('theme/public', 'ckanext-pdfpreview') def can_preview(self, data_dict): resource = data_dict['resource']