Improved covercp's annotated file output: blank lines have been reinstated, but blank or other non-statement lines are marked "not covered" if the next valid statement line is marked "not covered".

1 files changed, 14 insertions, 13 deletions

diff --git a/cherrypy/lib/covercp.py b/cherrypy/lib/covercp.py
index 7f56e34c..7d15e66e 100644
--- a/cherrypy/lib/covercp.py
+++ b/cherrypy/lib/covercp.py
@@ -284,7 +284,6 @@ def get_tree(base, exclude):
         for path in runs:
             if not _skip_file(path, exclude) and not os.path.isdir(path):
                 _graft(path, tree)
-    print tree
     return tree
 
 class CoverStats(object):
@@ -330,23 +329,25 @@ class CoverStats(object):
     
     def annotated_file(self, filename, statements, excluded, missing):
         source = open(filename, 'r')
-        lineno = 0
-        while 1:
-            line = source.readline()
-            if line == '':
-                break
-            line = line[:-1]
-            lineno = lineno + 1
-            if line == '':
-                yield ' '
-                continue
+        buffer = []
+        for lineno, line in enumerate(source.readlines()):
+            lineno += 1
+            line = line.strip("\n\r")
+            empty_the_buffer = True
             if lineno in excluded:
                 template = TEMPLATE_LOC_EXCLUDED
             elif lineno in missing:
                 template = TEMPLATE_LOC_NOT_COVERED
-            else:
+            elif lineno in statements:
                 template = TEMPLATE_LOC_COVERED
-            yield template % (lineno, cgi.escape(line))
+            else:
+                empty_the_buffer = False
+                buffer.append((lineno, line))
+            if empty_the_buffer:
+                for lno, pastline in buffer:
+                    yield template % (lno, cgi.escape(pastline))
+                buffer = []
+                yield template % (lineno, cgi.escape(line))
     
     def report(self, name):
         coverage.get_ready()