From 822dc76e182482a88696d150c44d1fb4cae5b996 Mon Sep 17 00:00:00 2001 From: Sergey Motornyuk Date: Mon, 23 Dec 2019 16:16:56 +0200 Subject: [PATCH] futuruze ckan codebase --- ckan/ckan_nose_plugin.py | 1 + ckan/cli/generate.py | 1 + ckan/i18n/check_po_files.py | 1 + ckan/lib/cli.py | 2 +- ckan/lib/config_tool.py | 1 + ckan/lib/jobs.py | 1 + ckan/lib/search/__init__.py | 3 ++- ckan/lib/uploader.py | 2 +- ckan/migration/migrate_package_activity.py | 3 ++- .../versions/083_f98d8fa2a7f7_remove_related_items.py | 1 + .../089_23c92480926e_package_activity_migration_check.py | 1 + ckan/pastertemplates/__init__.py | 1 + ckan/plugins/toolkit_sphinx_extension.py | 2 +- ckan/tests/legacy/functional/api/test_user.py | 1 + ckan/tests/legacy/models/test_resource.py | 1 + ckan/tests/legacy/test_coding_standards.py | 1 + 16 files changed, 18 insertions(+), 5 deletions(-) diff --git a/ckan/ckan_nose_plugin.py b/ckan/ckan_nose_plugin.py index d45120fbbdf..903189509d5 100644 --- a/ckan/ckan_nose_plugin.py +++ b/ckan/ckan_nose_plugin.py @@ -1,5 +1,6 @@ # encoding: utf-8 +from __future__ import print_function from nose.plugins import Plugin from inspect import isclass import hashlib diff --git a/ckan/cli/generate.py b/ckan/cli/generate.py index acb09817cdc..b8b7fe33056 100644 --- a/ckan/cli/generate.py +++ b/ckan/cli/generate.py @@ -1,5 +1,6 @@ # encoding: utf-8 +from __future__ import print_function import os import sys import click diff --git a/ckan/i18n/check_po_files.py b/ckan/i18n/check_po_files.py index 5cb2c90d0a2..de447232cd9 100755 --- a/ckan/i18n/check_po_files.py +++ b/ckan/i18n/check_po_files.py @@ -7,6 +7,7 @@ for usage. ''' +from __future__ import print_function import polib import re diff --git a/ckan/lib/cli.py b/ckan/lib/cli.py index 9f1271fda00..33dc16180f8 100644 --- a/ckan/lib/cli.py +++ b/ckan/lib/cli.py @@ -1212,7 +1212,7 @@ def get_info(self): print(' %s' % i) if extra: print(extra) - print + print() def actions(self, cls): ''' Return readable action function info. ''' diff --git a/ckan/lib/config_tool.py b/ckan/lib/config_tool.py index 8d5fe09005c..5895d531db8 100644 --- a/ckan/lib/config_tool.py +++ b/ckan/lib/config_tool.py @@ -1,5 +1,6 @@ # encoding: utf-8 +from __future__ import print_function import re INSERT_NEW_SECTIONS_BEFORE_SECTION = 'app:main' diff --git a/ckan/lib/jobs.py b/ckan/lib/jobs.py index 500b8fabf12..4e42d601baa 100644 --- a/ckan/lib/jobs.py +++ b/ckan/lib/jobs.py @@ -17,6 +17,7 @@ .. versionadded:: 2.7 ''' +from __future__ import print_function import logging diff --git a/ckan/lib/search/__init__.py b/ckan/lib/search/__init__.py index 36f7935d3cc..60af1b0f07b 100644 --- a/ckan/lib/search/__init__.py +++ b/ckan/lib/search/__init__.py @@ -1,5 +1,6 @@ # encoding: utf-8 +from __future__ import print_function import logging import sys import cgitb @@ -230,7 +231,7 @@ def check(): len(pkgs))) for pkg_id in pkgs_not_indexed: pkg = model.Session.query(model.Package).get(pkg_id) - print(pkg.revision.timestamp.strftime('%Y-%m-%d'), pkg.name) + print((pkg.revision.timestamp.strftime('%Y-%m-%d'), pkg.name)) def show(package_reference): diff --git a/ckan/lib/uploader.py b/ckan/lib/uploader.py index 0d83da02442..a805270e5ae 100644 --- a/ckan/lib/uploader.py +++ b/ckan/lib/uploader.py @@ -144,7 +144,7 @@ def update_data_dict(self, data_dict, url_field, file_field, clear_field): if not self.storage_path: return - if isinstance(self.upload_field_storage, (ALLOWED_UPLOAD_TYPES,)): + if isinstance(self.upload_field_storage, ALLOWED_UPLOAD_TYPES): if self.upload_field_storage.filename: self.filename = self.upload_field_storage.filename self.filename = str(datetime.datetime.utcnow()) + self.filename diff --git a/ckan/migration/migrate_package_activity.py b/ckan/migration/migrate_package_activity.py index 6ea3cbe1e4f..37b50d467bc 100644 --- a/ckan/migration/migrate_package_activity.py +++ b/ckan/migration/migrate_package_activity.py @@ -28,6 +28,7 @@ # whereas the main CLI is a list of tools for more frequent use. from __future__ import print_function +from __future__ import absolute_import import argparse import sys from collections import defaultdict @@ -104,7 +105,7 @@ def __enter__(self): except ImportError: # convenient to look for it in the current directory if you just # download these files because you are upgrading an older ckan - import revision_legacy_code + from . import revision_legacy_code self.existing_function = model_dictize.package_dictize model_dictize.package_dictize = \ revision_legacy_code.package_dictize_with_revisions diff --git a/ckan/migration/versions/083_f98d8fa2a7f7_remove_related_items.py b/ckan/migration/versions/083_f98d8fa2a7f7_remove_related_items.py index 8321f7943ab..6164819c1e5 100644 --- a/ckan/migration/versions/083_f98d8fa2a7f7_remove_related_items.py +++ b/ckan/migration/versions/083_f98d8fa2a7f7_remove_related_items.py @@ -6,6 +6,7 @@ Create Date: 2018-09-04 18:49:17.615242 """ +from __future__ import print_function from alembic import op import sqlalchemy as sa from ckan.migration import skip_based_on_legacy_engine_version diff --git a/ckan/migration/versions/089_23c92480926e_package_activity_migration_check.py b/ckan/migration/versions/089_23c92480926e_package_activity_migration_check.py index 9137d681dc1..79c76ed54b2 100644 --- a/ckan/migration/versions/089_23c92480926e_package_activity_migration_check.py +++ b/ckan/migration/versions/089_23c92480926e_package_activity_migration_check.py @@ -6,6 +6,7 @@ Create Date: 2019-05-09 13:39:17.486611 """ +from __future__ import print_function import sys from alembic import op diff --git a/ckan/pastertemplates/__init__.py b/ckan/pastertemplates/__init__.py index 07f8c7c1e4e..f2a40a97043 100644 --- a/ckan/pastertemplates/__init__.py +++ b/ckan/pastertemplates/__init__.py @@ -12,6 +12,7 @@ * http://pythonpaste.org/script/developer.html#templates """ +from __future__ import print_function import sys import jinja2 diff --git a/ckan/plugins/toolkit_sphinx_extension.py b/ckan/plugins/toolkit_sphinx_extension.py index 6ab963d0d86..6776eb370a2 100644 --- a/ckan/plugins/toolkit_sphinx_extension.py +++ b/ckan/plugins/toolkit_sphinx_extension.py @@ -170,7 +170,7 @@ def source_read(app, docname, source): source_ += format_function(name, thing, docstring=custom_docstring) elif inspect.isclass(thing): source_ += format_class(name, thing, docstring=custom_docstring) - elif isinstance(thing, types.ObjectType): + elif isinstance(thing, object): source_ += format_object(name, thing, docstring=custom_docstring) else: diff --git a/ckan/tests/legacy/functional/api/test_user.py b/ckan/tests/legacy/functional/api/test_user.py index 98968c3063e..55c03ee2925 100644 --- a/ckan/tests/legacy/functional/api/test_user.py +++ b/ckan/tests/legacy/functional/api/test_user.py @@ -1,6 +1,7 @@ # encoding: utf-8 +from __future__ import print_function import ckan.logic as logic from ckan import model from ckan.lib.create_test_data import CreateTestData diff --git a/ckan/tests/legacy/models/test_resource.py b/ckan/tests/legacy/models/test_resource.py index d8f88cb0fbb..cdc6017519d 100644 --- a/ckan/tests/legacy/models/test_resource.py +++ b/ckan/tests/legacy/models/test_resource.py @@ -1,5 +1,6 @@ # encoding: utf-8 +from __future__ import print_function import pytest import ckan.model as model diff --git a/ckan/tests/legacy/test_coding_standards.py b/ckan/tests/legacy/test_coding_standards.py index 274b1b409aa..5ed3c761f0a 100644 --- a/ckan/tests/legacy/test_coding_standards.py +++ b/ckan/tests/legacy/test_coding_standards.py @@ -16,6 +16,7 @@ current coding standards. Please add comments by files that fail if there are legitimate reasons for the failure. """ +from __future__ import print_function import inspect import itertools import os