Skip to content

Commit

Permalink
from .. import .. -> import .. as ..
Browse files Browse the repository at this point in the history
  • Loading branch information
domoritz authored and tobes committed Sep 19, 2012
1 parent a61c497 commit 4b252ab
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions ckanext/datastore/db.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
log = logging.getLogger(__name__)

if not os.environ.get('DATASTORE_LOAD'):
from paste.deploy.converters import asbool, aslist
from ckan.plugins import toolkit
import paste.deploy.converters as converters
import ckan.plugins.toolkit as toolkit
ValidationError = toolkit.ValidationError
else:
log.warn("Running datastore without CKAN")
Expand Down Expand Up @@ -54,7 +54,7 @@ def _get_list(input, strip=True):
if input == '':
return []

l = aslist(input, ',', True)
l = converters.aslist(input, ',', True)
if strip:
return [_strip(x) for x in l]
else:
Expand All @@ -64,7 +64,7 @@ def _get_list(input, strip=True):
def _get_bool(input, default=False):
if input in [None, '']:
return default
return asbool(input)
return converters.asbool(input)


def _is_valid_field_name(name):
Expand Down

0 comments on commit 4b252ab

Please sign in to comment.