From 9306edb3b257b8969af136d3d077187804ff515d Mon Sep 17 00:00:00 2001 From: Nicholas Kumia Date: Fri, 11 Aug 2023 17:17:56 -0400 Subject: [PATCH] lint: get action to pass lint: add reference for called function --- ckanext/googleanalytics/cli.py | 1 + ckanext/googleanalytics/config.py | 1 - ckanext/googleanalytics/ga_auth.py | 2 +- ckanext/googleanalytics/helpers.py | 1 + ckanext/googleanalytics/logic/action.py | 2 +- ckanext/googleanalytics/tests/test_view.py | 1 + ckanext/googleanalytics/utils.py | 2 +- 7 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ckanext/googleanalytics/cli.py b/ckanext/googleanalytics/cli.py index 073490f..e4b5e62 100644 --- a/ckanext/googleanalytics/cli.py +++ b/ckanext/googleanalytics/cli.py @@ -7,6 +7,7 @@ import re import logging import click import ckan.model as model +import ckan.plugins.toolkit as tk from . import dbutil, config diff --git a/ckanext/googleanalytics/config.py b/ckanext/googleanalytics/config.py index b73b4d7..149e3dd 100644 --- a/ckanext/googleanalytics/config.py +++ b/ckanext/googleanalytics/config.py @@ -49,7 +49,6 @@ def tracking_mode(): if id_.startswith("GTM-"): return "gtm" - return "ga" diff --git a/ckanext/googleanalytics/ga_auth.py b/ckanext/googleanalytics/ga_auth.py index 4c70675..cd3bf23 100644 --- a/ckanext/googleanalytics/ga_auth.py +++ b/ckanext/googleanalytics/ga_auth.py @@ -1,7 +1,7 @@ from apiclient.discovery import build from oauth2client.service_account import ServiceAccountCredentials -from ckanext.googleanalytics import utils, config +from ckanext.googleanalytics import config def init_service(credentials_file): diff --git a/ckanext/googleanalytics/helpers.py b/ckanext/googleanalytics/helpers.py index 52be647..ddd7571 100644 --- a/ckanext/googleanalytics/helpers.py +++ b/ckanext/googleanalytics/helpers.py @@ -45,5 +45,6 @@ def googleanalytics_header(): def googleanalytics_tracking_mode(): return config.tracking_mode() + def googleanalytics_id(): return config.tracking_id() diff --git a/ckanext/googleanalytics/logic/action.py b/ckanext/googleanalytics/logic/action.py index 8356066..fd64860 100644 --- a/ckanext/googleanalytics/logic/action.py +++ b/ckanext/googleanalytics/logic/action.py @@ -4,7 +4,7 @@ import ckan.plugins.toolkit as tk from ckan.logic import validate from . import schema -from .. import utils, config +from .. import config from ..model import PackageStats, ResourceStats from ..ga_auth import init_service, get_profile_id diff --git a/ckanext/googleanalytics/tests/test_view.py b/ckanext/googleanalytics/tests/test_view.py index 80ef9e9..48787fb 100644 --- a/ckanext/googleanalytics/tests/test_view.py +++ b/ckanext/googleanalytics/tests/test_view.py @@ -3,6 +3,7 @@ import pytest import ckan.plugins.toolkit as tk from ckanext.googleanalytics import config + def _render_header(mode, tracking_id): return tk.render_snippet("googleanalytics/snippets/_{}.html".format(mode), { "googleanalytics_id": tracking_id, diff --git a/ckanext/googleanalytics/utils.py b/ckanext/googleanalytics/utils.py index c241633..bd97b17 100644 --- a/ckanext/googleanalytics/utils.py +++ b/ckanext/googleanalytics/utils.py @@ -68,7 +68,7 @@ def _mp_event(event): data=json.dumps({ "client_id": config.measurement_protocol_client_id(), "non_personalized_ads": False, - "events":[event] + "events": [event] }, cls=SafeJSONEncoder) )