Merge latest code from main coverage.py repo

1 files changed, 2 insertions, 6 deletions

diff --git a/coverage/annotate.py b/coverage/annotate.py
index 5cbdd6a0..e6e7485d 100644
--- a/coverage/annotate.py
+++ b/coverage/annotate.py
@@ -33,17 +33,13 @@ class AnnotateReporter(Reporter):
     blank_re = re.compile(r"\s*(#|$)")
     else_re = re.compile(r"\s*else\s*:\s*(#|$)")
 
-    def report(self, morfs, directory=None, omit_prefixes=None,
-                include_prefixes=None):
+    def report(self, morfs, directory=None, omit=None, include=None):
         """Run the report.
 
         See `coverage.report()` for arguments.
 
         """
-        self.report_files(
-            self.annotate_file, morfs, directory, omit_prefixes,
-            include_prefixes
-            )
+        self.report_files(self.annotate_file, morfs, directory, omit, include)
 
     def annotate_file(self, cu, analysis):
         """Annotate a single file.