From a1d3bbc09fa2cb3c791041004920ba0e198fda45 Mon Sep 17 00:00:00 2001 From: Peter Bittner Date: Sat, 23 Jan 2016 00:47:40 +0100 Subject: [PATCH] [Spring Metrics] Fix code smell "redefine built-in" and flake8 complaints --- analytical/templatetags/spring_metrics.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/analytical/templatetags/spring_metrics.py b/analytical/templatetags/spring_metrics.py index 74e2767..ed2f063 100644 --- a/analytical/templatetags/spring_metrics.py +++ b/analytical/templatetags/spring_metrics.py @@ -52,8 +52,9 @@ def spring_metrics(parser, token): class SpringMetricsNode(Node): def __init__(self): - self.tracking_id = get_required_setting('SPRING_METRICS_TRACKING_ID', - TRACKING_ID_RE, "must be a hexadecimal string") + self.tracking_id = get_required_setting( + 'SPRING_METRICS_TRACKING_ID', + TRACKING_ID_RE, "must be a hexadecimal string") def render(self, context): custom = {} @@ -63,23 +64,25 @@ class SpringMetricsNode(Node): custom[var[15:]] = val if 'email' not in custom: identity = get_identity(context, 'spring_metrics', - lambda u: u.email) + lambda u: u.email) if identity is not None: custom['email'] = identity - html = TRACKING_CODE % {'tracking_id': self.tracking_id, - 'custom_commands': self._generate_custom_javascript(custom)} + html = TRACKING_CODE % { + 'tracking_id': self.tracking_id, + 'custom_commands': self._generate_custom_javascript(custom), + } if is_internal_ip(context, 'SPRING_METRICS'): html = disable_html(html, 'Spring Metrics') return html - def _generate_custom_javascript(self, vars): + def _generate_custom_javascript(self, params): commands = [] - convert = vars.pop('convert', None) + convert = params.pop('convert', None) if convert is not None: commands.append("_springMetq.push(['convert', '%s'])" % convert) commands.extend("_springMetq.push(['setdata', {'%s': '%s'}]);" - % (var, val) for var, val in vars.items()) + % (var, val) for var, val in params.items()) return " ".join(commands)