Defaulting report and annotate to all files now happens inside coverage, rather than in CoverageScript.

3 files changed, 7 insertions, 8 deletions

diff --git a/coverage/cmdline.py b/coverage/cmdline.py
index f13e49e..58eae71 100644
--- a/coverage/cmdline.py
+++ b/coverage/cmdline.py
@@ -122,10 +122,6 @@ class CoverageScript:
             execfile(sys.argv[0], __main__.__dict__)
         if settings.get('combine'):
             self.coverage.combine()
-        if not args:
-            # For report and annotate, if no files are given on the command
-            # line, then report or annotate everything that was executed.
-            args = self.coverage.data.executed.keys()  # TODO: Yikes!
 
         ignore_errors = settings.get('ignore-errors')
         show_missing = settings.get('show-missing')
diff --git a/coverage/control.py b/coverage/control.py
index 4251b2c..a5e5353 100644
--- a/coverage/control.py
+++ b/coverage/control.py
@@ -202,6 +202,7 @@ class coverage:
         self.report_engine(morfs, show_missing=show_missing, ignore_errors=ignore_errors, file=file)
 
     def report_engine(self, morfs, show_missing=True, ignore_errors=False, file=None, omit_prefixes=None):
+        morfs = morfs or self.data.executed_files()
         code_units = code_unit_factory(morfs, self.file_locator, omit_prefixes)
         code_units.sort()
 
@@ -257,6 +258,7 @@ class coverage:
     else_re = re.compile(r"\s*else\s*:\s*(#|$)")
 
     def annotate(self, morfs, directory=None, ignore_errors=False, omit_prefixes=None):
+        morfs = morfs or self.data.executed_files()
         code_units = code_unit_factory(morfs, self.file_locator, omit_prefixes)
         for cu in code_units:
             try:
diff --git a/coverage/data.py b/coverage/data.py
index 5d14a33..16bcf8f 100644
--- a/coverage/data.py
+++ b/coverage/data.py
@@ -102,11 +102,12 @@ class CoverageData:
         for filename, lineno in data_points:
             self.executed.setdefault(filename, {})[lineno] = True
 
+    def executed_files(self):
+        """A list of all files that had been measured as executed."""
+        return self.executed.keys()
+
     def executed_lines(self, filename):
-        """Return a mapping object such that "lineno in obj" is true if that
-        line number had been executed in `filename`.
-        """
-        # TODO: Write a better description.
+        """A map containing all the line numbers executed in `filename`."""
         return self.executed[filename]
 
     def summary(self):