[#4797] Update import references

Update import references for 25 files to refer to new converters:
`ckan.common` -- previous import were from `paste.deploy`

All tests passing.

ckan/authz.py

@@ -8,7 +8,7 @@
 from logging import getLogger
 
 from ckan.common import config
-from paste.deploy.converters import asbool
+from ckan.common import asbool
 
 import ckan.plugins as p
 import ckan.model as model

ckan/common.py

@@ -209,9 +209,11 @@ def _get_session():
 g = c = LocalProxy(_get_c)
 session = LocalProxy(_get_session)
 
-# replacement for converters that previously came from paste.deploy.compat [#4797]
-truthy = frozenset(['true', 'yes', 'on', 'y', 't', '1'])
-falsy = frozenset(['false', 'no', 'off', 'n', 'f', '0'])
+# replacement for converters that previously came from paste.deploy.converters
+# [#4797]
+truthy = frozenset([u'true', u'yes', u'on', u'y', u't', u'1'])
+falsy = frozenset([u'false', u'no', u'off', u'n', u'f', u'0'])
+
 
 def asbool(obj):
     if isinstance(obj, basestring):
@@ -221,16 +223,18 @@ def asbool(obj):
         elif obj in falsy:
             return False
         else:
-            raise ValueError("String is not true/false: {}".format(onj))
+            raise ValueError(u"String is not true/false: {}".format(obj))
     return bool(obj)
 
+
 def asint(obj):
     try:
         return int(obj)
     except (TypeError, ValueError):
-        raise ValueError("Bad integer value: {}".format(obj))
+        raise ValueError(u"Bad integer value: {}".format(obj))
+
 
-def aslist(onj, sep=None, strip=True):
+def aslist(obj, sep=None, strip=True):
     if isinstance(obj, basestring):
         lst = obj.split(sep)
         if strip:
@@ -241,4 +245,4 @@ def aslist(onj, sep=None, strip=True):
     elif obj is None:
         return []
     else:
-        return [obj]
+        return [obj]

ckan/config/middleware/flask_app.py

@@ -18,7 +18,7 @@
 from flask_babel import Babel
 
 from beaker.middleware import SessionMiddleware
-from paste.deploy.converters import asbool
+from ckan.common import asbool
 from fanstatic import Fanstatic
 from repoze.who.config import WhoConfig
 from repoze.who.middleware import PluggableAuthenticationMiddleware

ckan/config/middleware/pylons_app.py

@@ -9,7 +9,7 @@
 from paste.cascade import Cascade
 from paste.registry import RegistryManager
 from paste.urlparser import StaticURLParser
-from paste.deploy.converters import asbool
+from ckan.common import asbool
 from paste.fileapp import _FileIter
 from pylons.middleware import ErrorHandler, StatusCodeRedirect
 from routes.middleware import RoutesMiddleware

ckan/controllers/package.py

@@ -7,7 +7,7 @@
 import cgi
 
 from ckan.common import config
-from paste.deploy.converters import asbool
+from ckan.common import asbool
 import paste.fileapp
 from six import string_types, text_type
 

ckan/controllers/user.py

@@ -3,7 +3,7 @@
 import logging
 
 from ckan.common import config
-from paste.deploy.converters import asbool
+from ckan.common import asbool
 from six import text_type
 
 import ckan.lib.base as base

ckan/lib/activity_streams_session_extension.py

@@ -2,7 +2,7 @@
 
 from ckan.common import config
 from sqlalchemy.orm.session import SessionExtension
-from paste.deploy.converters import asbool
+from ckan.common import asbool
 import logging
 
 log = logging.getLogger(__name__)

ckan/lib/app_globals.py

@@ -7,7 +7,7 @@
 from threading import Lock
 import re
 
-from paste.deploy.converters import asbool
+from ckan.common import asbool
 from ckan.common import config
 
 import ckan

ckan/lib/cli.py

@@ -37,7 +37,7 @@
 import ckan.include.rcssmin as rcssmin
 import ckan.plugins as p
 from ckan.common import config
-from paste.deploy.converters import asbool
+from ckan.common import asbool
 # This is a test Flask request context to be used internally.
 # Do not use it!
 _cli_test_request_context = None

ckan/lib/i18n.py

@@ -47,7 +47,7 @@
                         get_locale_identifier,
                         UnknownLocaleError)
 from babel.support import Translations
-from paste.deploy.converters import aslist
+from ckan.common import aslist
 from pylons import i18n
 import pylons
 import polib

ckan/lib/mailer.py

@@ -12,7 +12,7 @@
 from email import Utils
 
 from ckan.common import config
-import paste.deploy.converters
+import ckan.common
 from six import text_type
 
 import ckan
@@ -62,7 +62,7 @@ def _mail_recipient(recipient_name, recipient_email,
         smtp_password = None
     else:
         smtp_server = config.get('smtp.server', 'localhost')
-        smtp_starttls = paste.deploy.converters.asbool(
+        smtp_starttls = ckan.common.asbool(
             config.get('smtp.starttls'))
         smtp_user = config.get('smtp.user')
         smtp_password = config.get('smtp.password')

ckan/lib/search/__init__.py

@@ -7,7 +7,7 @@
 import xml.dom.minidom
 import urllib2
 
-from paste.deploy.converters import asbool
+from ckan.common import asbool
 
 import ckan.model as model
 import ckan.plugins as p

ckan/lib/search/index.py

@@ -12,7 +12,7 @@
 
 import pysolr
 from ckan.common import config
-from paste.deploy.converters import asbool
+from ckan.common import asbool
 from six import text_type
 
 from common import SearchIndexError, make_connection

ckan/lib/search/query.py

@@ -5,7 +5,7 @@
 import six
 import pysolr
 
-from paste.deploy.converters import asbool
+from ckan.common import asbool
 from werkzeug.datastructures import MultiDict
 
 import ckan.logic as logic

ckan/logic/action/create.py

@@ -8,7 +8,7 @@
 from socket import error as socket_error
 import string
 
-import paste.deploy.converters
+import ckan.common
 from sqlalchemy import func
 
 import ckan.lib.plugins as lib_plugins
@@ -441,7 +441,7 @@ def resource_create_default_resource_views(context, data_dict):
 
     dataset_dict = data_dict.get('package')
 
-    create_datastore_views = paste.deploy.converters.asbool(
+    create_datastore_views = ckan.common.asbool(
         data_dict.get('create_datastore_views', False))
 
     return ckan.lib.datapreview.add_views_to_resource(
@@ -478,7 +478,7 @@ def package_create_default_resource_views(context, data_dict):
 
     _check_access('package_create_default_resource_views', context, data_dict)
 
-    create_datastore_views = paste.deploy.converters.asbool(
+    create_datastore_views = ckan.common.asbool(
         data_dict.get('create_datastore_views', False))
 
     return ckan.lib.datapreview.add_views_to_dataset_resources(
@@ -1171,7 +1171,7 @@ def activity_create(context, activity_dict, **kw):
                         'ignore_auth must be passed in the context not as '
                         'a param')
 
-    if not paste.deploy.converters.asbool(
+    if not ckan.common.asbool(
             config.get('ckan.activity_streams_enabled', 'true')):
         return
 

ckan/logic/action/get.py

@@ -11,7 +11,7 @@
 from ckan.common import config
 import sqlalchemy
 from sqlalchemy import text
-from paste.deploy.converters import asbool
+from ckan.common import asbool
 from six import string_types, text_type
 
 import ckan.lib.dictization

ckan/logic/action/update.py

@@ -10,7 +10,7 @@
 import os
 
 from ckan.common import config
-import paste.deploy.converters as converters
+import ckan.common as converters
 from six import text_type
 
 import ckan.lib.helpers as h

ckan/logic/auth/get.py

@@ -7,7 +7,7 @@
                              get_resource_object, get_activity_object,
                              restrict_anon)
 from ckan.lib.plugins import get_permission_labels
-from paste.deploy.converters import asbool
+from ckan.common import asbool
 
 
 def sysadmin(context, data_dict):

ckan/model/license.py

@@ -5,7 +5,7 @@
 import re
 
 from ckan.common import config
-from paste.deploy.converters import asbool
+from ckan.common import asbool
 from six import text_type, string_types
 
 from ckan.common import _, json

ckan/model/meta.py

@@ -2,7 +2,7 @@
 
 import datetime
 
-from paste.deploy.converters import asbool
+from ckan.common import asbool
 from ckan.common import config
 """SQLAlchemy Metadata and Session object"""
 from sqlalchemy import MetaData, and_

ckan/plugins/core.py

@@ -11,7 +11,7 @@
 from pyutilib.component.core import ExtensionPoint as PluginImplementations
 from pyutilib.component.core import SingletonPlugin as _pca_SingletonPlugin
 from pyutilib.component.core import Plugin as _pca_Plugin
-from paste.deploy.converters import asbool
+from ckan.common import asbool
 from six import string_types
 
 import interfaces

ckan/plugins/toolkit.py

@@ -146,7 +146,7 @@ def _initialize(self):
         )
         from ckan.lib.jobs import enqueue as enqueue_job
 
-        from paste.deploy import converters
+        import ckan.common as converters
         import pylons
         import webhelpers.html.tags
 

ckan/views/__init__.py

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-from paste.deploy.converters import asbool
+from ckan.common import asbool
 from six import text_type
 from werkzeug import import_string, cached_property
 

ckan/views/dataset.py

@@ -7,7 +7,7 @@
 
 from flask import Blueprint, make_response
 from flask.views import MethodView
-from paste.deploy.converters import asbool
+from ckan.common import asbool
 from six import string_types, text_type
 
 import ckan.lib.i18n as i18n

ckan/views/user.py

@@ -3,7 +3,7 @@
 
 from flask import Blueprint
 from flask.views import MethodView
-from paste.deploy.converters import asbool
+from ckan.common import asbool
 from six import text_type
 
 import ckan.lib.authenticator as authenticator

ckanext/datastore/helpers.py

@@ -3,7 +3,7 @@
 import json
 import logging
 
-import paste.deploy.converters as converters
+import ckan.common as converters
 import sqlparse
 
 from six import string_types

test-core.ini

@@ -16,11 +16,11 @@ testing = true
 
 
 # Specify the Postgres database for SQLAlchemy to use
-sqlalchemy.url = postgresql://ckan_default:pass@localhost/ckan_test
+sqlalchemy.url = postgresql://ckan_default:ckan@localhost/ckan_test
 
 ## Datastore
-ckan.datastore.write_url = postgresql://ckan_default:pass@localhost/datastore_test
-ckan.datastore.read_url = postgresql://datastore_default:pass@localhost/datastore_test
+ckan.datastore.write_url = postgresql://ckan_default:ckan@localhost/datastore_test
+ckan.datastore.read_url = postgresql://datastore_default:ckan@localhost/datastore_test
 
 ckan.datapusher.url = http://datapusher.ckan.org/
 ckan.datapusher.formats = csv xls xlsx tsv application/csv application/vnd.ms-excel application/vnd.openxmlformats-officedocument.spreadsheetml.sheet