Moved some code and tweaked settings to ignore sql debug functions when calculating code coverage.

 - Legacy-Id: 12069

Author: levkowetz

ietf/doc/templatetags/ietf_filters.py

@@ -24,13 +24,6 @@
 def collapsebr(html):
     return re.sub('(<(br ?/|/p)>[ \n]*)(<(br) ?/?>[ \n]*)*(<(br|p) ?/?>[ \n]*)', '\\1\\5', html)
 
-@register.filter(name='expand_comma')
-def expand_comma(value):
-    """
-    Adds a space after each comma, to allow word-wrapping of
-    long comma-separated lists."""
-    return value.replace(",", ", ")
-
 @register.filter
 def indent(value, numspaces=2):
     replacement = "\n" + " " * int(numspaces)
@@ -119,15 +112,6 @@ def make_one_per_line(value):
     else:
         return value
 
-@register.filter(name='timesum')
-def timesum(value):
-    """
-    Sum the times in a list of dicts; used for sql query debugging info"""
-    sum = 0.0
-    for v in value:
-        sum += float(v['time'])
-    return sum
-
 @register.filter(name='keep_spacing')
 def keep_spacing(value):
     """
@@ -632,21 +616,3 @@ def comma_separated_list(seq, end_word="and"):
 def role_names(roles):
     return list(set([ "%s %s" % (r.group.name, r.name.name) for r in roles ]))
 
-@register.filter()
-def annotate_sql_queries(queries):
-    counts  = {}
-    timeacc = {}
-    for q in queries:
-        sql = q['sql']
-        if not sql in counts:
-            counts[sql] = 0;
-        counts[sql] += 1
-        if not sql in timeacc:
-            timeacc[sql] = 0.0;
-        timeacc[sql] += float(q['time'])
-    for q in queries:
-        sql = q['sql']
-        q['count'] = str(counts[sql])
-        q['time_accum'] = "%4.3f" % timeacc[sql]
-    return queries
-    

ietf/settings.py

@@ -391,6 +391,7 @@ def skip_unreadable_post(record):
     "ietf/settings*",
     "ietf/utils/test_runner.py",
     "ietf/checks.py",
+    "ietf/utils/templatetags/debug_filters.py",
 ]
 
 TEST_COVERAGE_MASTER_FILE = os.path.join(BASE_DIR, "../release-coverage.json.gz")

ietf/templates/debug.html

@@ -1,7 +1,7 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}{% origin %}
 {% if debug %}
-  {% load ietf_filters %}
+  {% load debug_filters %}
   {% load future %}
 
   <div id="debug">