diff --git a/ckanext/odsh/helper_pkg_dict.py b/ckanext/odsh/helper_pkg_dict.py index 514e3551360ac26151653f12f77739a000b6dca7..a35c9cf88bc2e4c9fbcf78cc7155407b431cf726 100644 --- a/ckanext/odsh/helper_pkg_dict.py +++ b/ckanext/odsh/helper_pkg_dict.py @@ -3,8 +3,6 @@ import re import ckanext.odsh.helpers as helpers_odsh import datetime -import ckanext.odsh.collection.helpers as helpers_collection - import ckanext.odsh.uri_store as uri_store from ckanext.odsh.pretty_daterange.date_range_formatter import DateRangeFormatter diff --git a/ckanext/odsh/helpers.py b/ckanext/odsh/helpers.py index d4f79562cda126cbb9714a7f66f4630a6b05fabb..54940abe69bd28ac233194289b2b5f6a20b9019d 100644 --- a/ckanext/odsh/helpers.py +++ b/ckanext/odsh/helpers.py @@ -6,7 +6,6 @@ import ast import ckan.plugins.toolkit as toolkit import ckan.logic as logic import ckan.model as model -import ckan.logic.action as action import ckan.lib.helpers as helpers import json from ckan.common import c @@ -19,14 +18,10 @@ import re import csv import urllib.request, urllib.error, urllib.parse from ckan.common import request -import pdb from urllib.parse import urlsplit, urlunsplit -import subprocess import ckan.lib.helpers as helpers -import os.path from collections import OrderedDict import pkg_resources -import ckan.logic.action.create as create CKAN_TYPES = {'http://dcat-ap.de/def/datasetTypes/collection': 'collection'} diff --git a/ckanext/odsh/lib/uploader.py b/ckanext/odsh/lib/uploader.py index 3ef936af83fb3b167f0098a34bd8d8f95ebc72d9..2c6db29da930f05f0b06a1e5b7ed55906a80a513 100644 --- a/ckanext/odsh/lib/uploader.py +++ b/ckanext/odsh/lib/uploader.py @@ -1,7 +1,5 @@ import ckan.logic as logic from ckan.lib.uploader import ResourceUpload, Upload -import ckan.plugins.toolkit as toolkit -import ckan.plugins.toolkit as tk import logging import hashlib diff --git a/ckanext/odsh/odsh_logger.py b/ckanext/odsh/odsh_logger.py index 54eea1b0bd88889c57c8b9d761580e83f654ff34..3235817b2e75a93ae061b7ce74f74e82ea284e4b 100644 --- a/ckanext/odsh/odsh_logger.py +++ b/ckanext/odsh/odsh_logger.py @@ -1,6 +1,4 @@ from multiline_formatter.formatter import MultilineMessagesFormatter -import ckan.plugins as plugins -import ckan.plugins.toolkit as toolkit class OdshLogger(MultilineMessagesFormatter): diff --git a/ckanext/odsh/pdf_to_thumbnail/thumbnail.py b/ckanext/odsh/pdf_to_thumbnail/thumbnail.py index bf5199803e8959dd6a6a52b821b4938c90f9b97e..25067f73e42c669c15593b929698b3b13fec6c0e 100644 --- a/ckanext/odsh/pdf_to_thumbnail/thumbnail.py +++ b/ckanext/odsh/pdf_to_thumbnail/thumbnail.py @@ -1,17 +1,13 @@ import os -import tempfile import magic from pdf2image import convert_from_bytes import logging from ckan.common import config import urllib.request, urllib.error, urllib.parse -import requests from binascii import b2a_hex import ckan.plugins.toolkit as toolkit -import ckan.logic as logic -#from extension -#from ckanext.odsh.lib.uploader import raise_validation_error_if_virus_found + log = logging.getLogger(__name__) diff --git a/ckanext/odsh/tests/test_checksum.py b/ckanext/odsh/tests/test_checksum.py index 1d4dda63b9d19d656db07c601a5a127e084a7f87..147d76581e432cc146b6e991335648b42e53f7d3 100644 --- a/ckanext/odsh/tests/test_checksum.py +++ b/ckanext/odsh/tests/test_checksum.py @@ -1,6 +1,5 @@ from mock import patch, mock_open from ckanext.odsh.lib.uploader import _raise_validation_error_if_hash_values_differ, calculate_hash -import ckantoolkit as ct import ckan.logic as logic import hashlib import unittest diff --git a/ckanext/odsh/tests/test_odsh_helpers.py b/ckanext/odsh/tests/test_odsh_helpers.py index 0f5a788a5434753afdc702ac95070db107223071..fba58f02bb22c6da9da263addc0a2b4bd4e24c18 100644 --- a/ckanext/odsh/tests/test_odsh_helpers.py +++ b/ckanext/odsh/tests/test_odsh_helpers.py @@ -2,12 +2,7 @@ import datetime from mock import patch import unittest -import ckan.lib.helpers as helpers - -import ckanext.odsh.helpers as odsh_helpers from ckanext.odsh.helpers import is_within_last_month -import ckanext.odsh.collection.helpers as helpers_collection -import ckan.model as model class Test_is_within_last_month(unittest.TestCase): def test_it_returns_true_for_simple_query(self): diff --git a/ckanext/odsh/tests/test_profiles.py b/ckanext/odsh/tests/test_profiles.py index acf97611b0f92d80d570be3b955ca0661843cfb2..953a201ce426c3be898260ec3b40649aedf7cb83 100644 --- a/ckanext/odsh/tests/test_profiles.py +++ b/ckanext/odsh/tests/test_profiles.py @@ -6,7 +6,6 @@ from mock import patch from ckanext.dcat.profiles import URIRefOrLiteral import ckanext.odsh.profiles as profiles -import ckanext.odsh.helper_pkg_dict as helper_pkg_dict DCT = rdflib.namespace.Namespace("http://purl.org/dc/terms/") diff --git a/ckanext/odsh/views/feed.py b/ckanext/odsh/views/feed.py index e8b3649215b8a4a2f068ee4c37b8afdedbf8c0fa..2305e2f3b0ea9b55143f045cd3993fd366ab5d27 100644 --- a/ckanext/odsh/views/feed.py +++ b/ckanext/odsh/views/feed.py @@ -1,4 +1,3 @@ -import ckan.plugins.toolkit as toolkit from flask import Blueprint from flask import request import ckan.views.feed as ckan_feed diff --git a/ckanext/odsh/views/package.py b/ckanext/odsh/views/package.py index 80864fec21281c2adc110a8db8e55be615670448..c082dffc33505fe3297a3fd17c36998838f68a15 100644 --- a/ckanext/odsh/views/package.py +++ b/ckanext/odsh/views/package.py @@ -1,5 +1,4 @@ import ckan.plugins.toolkit as toolkit -import ckan.authz as authz from flask import Blueprint import logging diff --git a/ckanext/odsh/views/user.py b/ckanext/odsh/views/user.py index 4178e4193da8b366c73a07fd6eba68a2cd7c1916..4c3e0874e13ac4bae200f34906cbb36f84ba960c 100644 --- a/ckanext/odsh/views/user.py +++ b/ckanext/odsh/views/user.py @@ -1,6 +1,5 @@ import ckan.plugins.toolkit as toolkit import ckan.authz as authz -import ckan.logic as logic from ckan.common import g from flask import Blueprint import ckan.views.user as ckan_user_view