Merge pull request #50 from scottlimmer/feature/49-builtins-compatibility
[#49] Use of builtins module in controller breaks CKAN Version: >= 2.…
This commit is contained in:
commit
cbee3f06d6
|
@ -1,5 +1,5 @@
|
||||||
from __future__ import absolute_import
|
from __future__ import absolute_import
|
||||||
from builtins import str
|
|
||||||
import logging
|
import logging
|
||||||
from ckan.lib.base import BaseController, c, render, request
|
from ckan.lib.base import BaseController, c, render, request
|
||||||
from . import dbutil
|
from . import dbutil
|
||||||
|
@ -13,6 +13,16 @@ from paste.util.multidict import MultiDict
|
||||||
|
|
||||||
from ckan.controllers.api import ApiController
|
from ckan.controllers.api import ApiController
|
||||||
|
|
||||||
|
from ckan.exceptions import CkanVersionException
|
||||||
|
import ckan.plugins.toolkit as tk
|
||||||
|
try:
|
||||||
|
tk.requires_ckan_version("2.9")
|
||||||
|
except CkanVersionException:
|
||||||
|
pass
|
||||||
|
else:
|
||||||
|
from builtins import str
|
||||||
|
|
||||||
|
|
||||||
log = logging.getLogger("ckanext.googleanalytics")
|
log = logging.getLogger("ckanext.googleanalytics")
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue