From 27969ba3cc47d50af55b74514082c70e71bcc20f Mon Sep 17 00:00:00 2001 From: Scott Limmer Date: Fri, 13 Nov 2020 11:12:34 +1100 Subject: [PATCH] [#49] Use of builtins module in controller breaks CKAN Version: >= 2.7, <=2.9 compatibility Added version check to controller to control builtins import --- ckanext/googleanalytics/controller.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/ckanext/googleanalytics/controller.py b/ckanext/googleanalytics/controller.py index cdf9922..a2e0933 100644 --- a/ckanext/googleanalytics/controller.py +++ b/ckanext/googleanalytics/controller.py @@ -1,5 +1,5 @@ from __future__ import absolute_import -from builtins import str + import logging from ckan.lib.base import BaseController, c, render, request from . import dbutil @@ -13,6 +13,16 @@ from paste.util.multidict import MultiDict 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")