refactor: plural does more

nedbat · nedbat · commit 27d8daac216f · 2026-01-22T21:30:21.000-05:00
diff --git a/coverage/data.py b/coverage/data.py
@@ -241,9 +241,9 @@ def debug_data_file(filename: str) -> None:
     summary = line_counts(data, fullpath=True)
     filenames = human_sorted(summary.keys())
     nfiles = len(filenames)
-    print(f"{nfiles} file{plural(nfiles)}:")
+    print(f"{plural(nfiles, 'file')}:")
     for f in filenames:
-        line = f"{f}: {summary[f]} line{plural(summary[f])}"
+        line = f"{f}: {plural(summary[f], 'line')}"
         plugin = data.file_tracer(f)
         if plugin:
             line += f" [{plugin}]"
diff --git a/coverage/files.py b/coverage/files.py
@@ -231,7 +231,7 @@ def __init__(self, strs: list[str], name: str, caption: str, debug: DebugFn) ->
 
     def __str__(self) -> str:
         n = len(self.strs)
-        return f"{self.__class__.__name__} {self.name!r} {n} {plural(n, 'item')}"
+        return f"{self.__class__.__name__} {self.name!r} {plural(n, 'item')}"
 
     def __repr__(self) -> str:
         return f"<{self.__class__.__name__} {self.name} {self.strs!r}>"
diff --git a/coverage/html.py b/coverage/html.py
@@ -638,11 +638,11 @@ def write_index_page(self, index_page: IndexPage, **kwargs: str) -> str:
         """
         skipped_covered_msg = skipped_empty_msg = ""
         if n := index_page.skipped_covered_count:
-            word = plural(n, index_page.noun, index_page.plural)
-            skipped_covered_msg = f"{n} {word} skipped due to complete coverage."
+            things = plural(n, index_page.noun, index_page.plural)
+            skipped_covered_msg = f"{things} skipped due to complete coverage."
         if n := index_page.skipped_empty_count:
-            word = plural(n, index_page.noun, index_page.plural)
-            skipped_empty_msg = f"{n} empty {word} skipped."
+            things = plural(n, "empty " + index_page.noun, "empty " + index_page.plural)
+            skipped_empty_msg = f"{things} skipped."
 
         index_buttons = [
             {
diff --git a/coverage/misc.py b/coverage/misc.py
@@ -364,9 +364,10 @@ def plural(n: int, thing: str = "", things: str = "") -> str:
     If n is 1, return thing.  Otherwise return things, or thing+s.
     """
     if n == 1:
-        return thing
+        noun = thing
     else:
-        return things or (thing + "s")
+        noun = things or (thing + "s")
+    return f"{n} {noun}"
 
 
 def stdout_link(text: str, url: str) -> str:
diff --git a/coverage/report.py b/coverage/report.py
@@ -267,13 +267,11 @@ def tabular_report(self) -> None:
         # Create other final lines.
         end_lines = []
         if self.config.skip_covered and self.skipped_count:
-            files = plural(self.skipped_count, "file")
             end_lines.append(
-                f"\n{self.skipped_count} {files} skipped due to complete coverage.",
+                f"\n{plural(self.skipped_count, 'file')} skipped due to complete coverage.",
             )
         if self.config.skip_empty and self.empty_count:
-            files = plural(self.empty_count, "file")
-            end_lines.append(f"\n{self.empty_count} empty {files} skipped.")
+            end_lines.append(f"\n{plural(self.empty_count, 'empty file')} skipped.")
 
         if self.output_format == "markdown":
             formatter = self.report_markdown
