Merge branch 'master' into 4914-urllib-python3

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

@@ -12,6 +12,7 @@
 
 import flask
 import pylons
+import six
 
 from werkzeug.local import Local, LocalProxy
 
@@ -208,3 +209,39 @@ def _get_session():
 # Provide a `c`  alias for `g` for backwards compatibility
 g = c = LocalProxy(_get_c)
 session = LocalProxy(_get_session)
+
+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, six.string_types):
+        obj = obj.strip().lower()
+        if obj in truthy:
+            return True
+        elif obj in falsy:
+            return False
+        else:
+            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(u"Bad integer value: {}".format(obj))
+
+
+def aslist(obj, sep=None, strip=True):
+    if isinstance(obj, six.string_types):
+        lst = obj.split(sep)
+        if strip:
+            lst = [v.strip() for v in lst]
+        return lst
+    elif isinstance(obj, (list, tuple)):
+        return obj
+    elif obj is None:
+        return []
+    else:
+        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