HTML reporting, phase 0.

1 files changed, 3 insertions, 19 deletions

diff --git a/coverage/annotate.py b/coverage/annotate.py
index b861a6f..ee04910 100644
--- a/coverage/annotate.py
+++ b/coverage/annotate.py
@@ -13,24 +13,8 @@ class AnnotateReporter(Reporter):
     else_re = re.compile(r"\s*else\s*:\s*(#|$)")
 
     def report(self, morfs, directory=None, omit_prefixes=None):
-        self.find_code_units(morfs, omit_prefixes)
-
-        self.directory = directory
-        if self.directory and not os.path.exists(self.directory):
-            os.makedirs(self.directory)
-
-        for cu in self.code_units:
-            try:
-                if not cu.relative:
-                    continue
-                statements, excluded, missing, _ = self.coverage.analyze(cu)
-                self.annotate_file(cu, statements, excluded, missing)
-            except KeyboardInterrupt:
-                raise
-            except:
-                if not self.ignore_errors:
-                    raise
-                
+        self.report_files(self.annotate_file, morfs, directory, omit_prefixes)
+        
     def annotate_file(self, cu, statements, excluded, missing):
         """Annotate a single file.
         
@@ -38,7 +22,7 @@ class AnnotateReporter(Reporter):
         
         """
         filename = cu.filename
-        source = open(filename, 'r')
+        source = cu.source_file()
         if self.directory:
             dest_file = os.path.join(self.directory, cu.flat_rootname())
             dest_file += ".py,cover"