[#4801] Transform relative imports into absolute ones

ckan/controllers/admin.py

@@ -8,8 +8,7 @@
 import ckan.lib.navl.dictization_functions as dict_fns
 import ckan.model as model
 import ckan.logic as logic
-import ckan.plugins as plugins
-from home import CACHE_PARAMETERS
+from ckan.controllers.home import CACHE_PARAMETERS
 
 
 c = base.c

ckan/controllers/package.py

@@ -25,7 +25,7 @@
 import ckan.lib.render
 
 from ckan.common import OrderedDict, _, json, request, c, response
-from home import CACHE_PARAMETERS
+from ckan.controllers.home import CACHE_PARAMETERS
 
 log = logging.getLogger(__name__)
 

ckan/lib/cli.py

@@ -1295,8 +1295,7 @@ class CreateTestDataCommand(CkanCommand):
 
     def command(self):
         self._load_config()
-        from ckan import plugins
-        from create_test_data import CreateTestData
+        from ckan.lib.create_test_data import CreateTestData
 
         if self.args:
             cmd = self.args[0]
@@ -2364,7 +2363,7 @@ class ConfigToolCommand(paste.script.command.Command):
         help='Supply an options file to merge in')
 
     def command(self):
-        import config_tool
+        from ckan.lib import config_tool
         if len(self.args) < 1:
             self.parser.error('Not enough arguments (got %i, need at least 1)'
                               % len(self.args))

ckan/lib/helpers.py

@@ -17,7 +17,7 @@
 import uuid
 
 from paste.deploy import converters
-from webhelpers.html import HTML, literal, tags, tools
+from webhelpers.html import HTML, literal, tags
 from webhelpers import paginate
 import webhelpers.text as whtext
 import webhelpers.date as date
@@ -26,12 +26,12 @@
 from pylons import url as _pylons_default_url
 from ckan.common import config, is_flask_request
 from flask import redirect as _flask_redirect
-from flask import _request_ctx_stack, current_app
+from flask import _request_ctx_stack
 from routes import redirect_to as _routes_redirect_to
 from routes import url_for as _routes_default_url_for
 from flask import url_for as _flask_default_url_for
 from werkzeug.routing import BuildError as FlaskRouteBuildError
-import i18n
+from ckan.lib import i18n
 
 from six import string_types, text_type
 from six.moves.urllib.parse import (
@@ -2690,7 +2690,7 @@ def compare_pkg_dicts(old, new, old_activity_id):
     string indicating the type of change made as well as other data necessary
     to form a detailed summary of the change.
     '''
-    from changes import check_metadata_changes, check_resource_changes
+    from ckan.lib.changes import check_metadata_changes, check_resource_changes
     change_list = []
 
     check_metadata_changes(change_list, old, new)

ckan/lib/navl/dictization_functions.py

@@ -6,9 +6,7 @@
 import json
 
 from six import text_type
-from ckan.common import config
-
-from ckan.common import _
+from ckan.common import config, _
 
 
 class Missing(object):

ckan/lib/redis.py

@@ -5,10 +5,6 @@
 
 .. versionadded:: 2.7
 '''
-
-from __future__ import absolute_import
-
-import datetime
 import logging
 
 from redis import ConnectionPool, Redis

ckan/lib/search/__init__.py

@@ -8,17 +8,20 @@
 
 import requests
 
-from ckan.common import asbool
-
 import ckan.model as model
 import ckan.plugins as p
 import ckan.logic as logic
 
-from common import (SearchIndexError, SearchError, SearchQueryError,
-                    make_connection, is_available, SolrSettings)
-from index import PackageSearchIndex, NoopSearchIndex
-from query import (TagSearchQuery, ResourceSearchQuery, PackageSearchQuery,
-                   QueryOptions, convert_legacy_parameters_to_solr)
+from ckan.lib.search.common import (
+    SearchIndexError, SearchError, SearchQueryError,
+    make_connection, is_available, SolrSettings
+)
+from ckan.lib.search.index import PackageSearchIndex, NoopSearchIndex
+from ckan.lib.search.query import (
+    TagSearchQuery, ResourceSearchQuery, PackageSearchQuery,
+    QueryOptions, convert_legacy_parameters_to_solr
+)
+
 
 log = logging.getLogger(__name__)
 

ckan/lib/search/index.py

@@ -16,7 +16,7 @@
 from six import text_type
 from six.moves import map
 
-from common import SearchIndexError, make_connection
+from .common import SearchIndexError, make_connection
 from ckan.model import PackageRelationship
 import ckan.model as model
 from ckan.plugins import (PluginImplementations,

ckan/model/__init__.py

@@ -19,107 +19,108 @@
 )
 from alembic.config import Config as AlembicConfig
 
-import meta
-from meta import (
+from ckan.model import meta
+
+from ckan.model.meta import (
     Session,
     engine_is_sqlite,
     engine_is_pg,
 )
-from core import (
+from ckan.model.core import (
     System,
     State,
 )
-from package import (
+from ckan.model.package import (
     Package,
     PACKAGE_NAME_MIN_LENGTH,
     PACKAGE_NAME_MAX_LENGTH,
     PACKAGE_VERSION_MAX_LENGTH,
     package_table,
 )
-from tag import (
+from ckan.model.tag import (
     Tag,
     PackageTag,
     MAX_TAG_LENGTH,
     MIN_TAG_LENGTH,
     tag_table,
     package_tag_table,
 )
-from user import (
+from ckan.model.user import (
     User,
     user_table,
 )
-from group import (
+from ckan.model.group import (
     Member,
     Group,
     group_table,
     member_table,
 )
-from group_extra import (
+from ckan.model.group_extra import (
     GroupExtra,
     group_extra_table,
 )
-from package_extra import (
+from ckan.model.package_extra import (
     PackageExtra,
     package_extra_table,
 )
-from resource import (
+from ckan.model.resource import (
     Resource,
     DictProxy,
     resource_table,
 )
-from resource_view import (
+from ckan.model.resource_view import (
     ResourceView,
     resource_view_table,
 )
-from tracking import (
+from ckan.model.tracking import (
     tracking_summary_table,
     TrackingSummary,
     tracking_raw_table
 )
-from rating import (
+from ckan.model.rating import (
     Rating,
     MIN_RATING,
     MAX_RATING,
 )
-from package_relationship import (
+from ckan.model.package_relationship import (
     PackageRelationship,
     package_relationship_table,
 )
-from task_status import (
+from ckan.model.task_status import (
     TaskStatus,
     task_status_table,
 )
-from vocabulary import (
+from ckan.model.vocabulary import (
     Vocabulary,
     VOCABULARY_NAME_MAX_LENGTH,
     VOCABULARY_NAME_MIN_LENGTH,
 )
-from activity import (
+from ckan.model.activity import (
     Activity,
     ActivityDetail,
     activity_table,
     activity_detail_table,
 )
-from term_translation import (
+from ckan.model.term_translation import (
     term_translation_table,
 )
-from follower import (
+from ckan.model.follower import (
     UserFollowingUser,
     UserFollowingDataset,
     UserFollowingGroup,
 )
-from system_info import (
+from ckan.model.system_info import (
     system_info_table,
     SystemInfo,
     get_system_info,
     set_system_info,
     delete_system_info,
 )
-from domain_object import (
+from ckan.model.domain_object import (
     DomainObjectOperation,
     DomainObject,
 )
-from dashboard import (
+from ckan.model.dashboard import (
     Dashboard,
 )
 

ckan/model/activity.py

@@ -16,9 +16,8 @@
 )
 
 import ckan.model
-import meta
-import types as _types
-import domain_object
+from ckan.model import meta
+from ckan.model import domain_object, types as _types
 
 __all__ = ['Activity', 'activity_table',
            'ActivityDetail', 'activity_detail_table',

ckan/model/core.py

@@ -1,11 +1,6 @@
 # encoding: utf-8
 
-import datetime
-
-from sqlalchemy import Column, DateTime, Text, Boolean
-
-import domain_object
-import meta
+from ckan.model import domain_object
 
 
 __all__ = ['System', 'State', 'StatefulObjectMixin']

ckan/model/dashboard.py

@@ -2,7 +2,7 @@
 
 import datetime
 import sqlalchemy
-import meta
+from ckan.model import meta
 
 dashboard_table = sqlalchemy.Table('dashboard', meta.metadata,
     sqlalchemy.Column('user_id', sqlalchemy.types.UnicodeText,

ckan/model/domain_object.py

@@ -6,11 +6,12 @@
 from sqlalchemy import orm
 from sqlalchemy.util import OrderedDict
 
-import meta
-import core
+from ckan.model import meta, core
+
 
 __all__ = ['DomainObject', 'DomainObjectOperation']
 
+
 class Enum(set):
     '''Simple enumeration
     e.g. Animal = Enum("dog", "cat", "horse")

ckan/model/follower.py

@@ -1,12 +1,12 @@
 # encoding: utf-8
 
-import meta
+from ckan.model import meta
 import datetime
 import sqlalchemy
 
-import core
+from ckan.model import core
 import ckan.model
-import domain_object
+from ckan.model import domain_object
 
 
 class ModelFollowingModel(domain_object.DomainObject):

ckan/model/group.py

@@ -4,12 +4,12 @@
 
 from sqlalchemy import orm, types, Column, Table, ForeignKey, or_, and_, text
 
-import meta
-import core
-import package as _package
-import types as _types
-import domain_object
-import user as _user
+from ckan.model import meta
+from ckan.model import core
+from ckan.model import package as _package
+from ckan.model import types as _types
+from ckan.model import domain_object
+from ckan.model import user as _user
 
 __all__ = ['group_table', 'Group',
            'Member',

ckan/model/group_extra.py

@@ -4,11 +4,13 @@
 from sqlalchemy.ext.associationproxy import association_proxy
 from six import text_type
 
-import group
-import meta
-import core
-import types as _types
-import domain_object
+from ckan.model import (
+    group,
+    meta,
+    core,
+    types as _types,
+    domain_object
+)
 
 
 __all__ = ['GroupExtra', 'group_extra_table']

ckan/model/meta.py

@@ -9,7 +9,7 @@
 import sqlalchemy.orm as orm
 from sqlalchemy.orm.session import SessionExtension
 
-import extension
+from ckan.model import extension
 
 __all__ = ['Session', 'engine_is_sqlite', 'engine_is_pg']