style: tighten some mypy pragmas

Author: nedbat

coverage/config.py

@@ -465,7 +465,7 @@ def set_option(self, option_name: str, value: Union[TConfigValueIn, TConfigSecti
         """
         # Special-cased options.
         if option_name == "paths":
-            self.paths = value  # type: ignore
+            self.paths = value  # type: ignore[assignment]
             return
 
         # Check all the hard-coded options.
@@ -478,7 +478,7 @@ def set_option(self, option_name: str, value: Union[TConfigValueIn, TConfigSecti
         # See if it's a plugin option.
         plugin_name, _, key = option_name.partition(":")
         if key and plugin_name in self.plugins:
-            self.plugin_options.setdefault(plugin_name, {})[key] = value # type: ignore
+            self.plugin_options.setdefault(plugin_name, {})[key] = value # type: ignore[index]
             return
 
         # If we get here, we didn't find the option.
@@ -496,13 +496,13 @@ def get_option(self, option_name: str) -> Optional[TConfigValueOut]:
         """
         # Special-cased options.
         if option_name == "paths":
-            return self.paths  # type: ignore
+            return self.paths  # type: ignore[return-value]
 
         # Check all the hard-coded options.
         for option_spec in self.CONFIG_FILE_OPTIONS:
             attr, where = option_spec[:2]
             if where == option_name:
-                return getattr(self, attr)  # type: ignore
+                return getattr(self, attr)  # type: ignore[no-any-return]
 
         # See if it's a plugin option.
         plugin_name, _, key = option_name.partition(":")

coverage/debug.py

@@ -105,7 +105,7 @@ def __init__(self, options: Iterable[str]) -> None:
 
     def get_output(self) -> str:
         """Get the output text from the `DebugControl`."""
-        return cast(str, self.raw_output.getvalue())        # type: ignore
+        return cast(str, self.raw_output.getvalue())        # type: ignore[union-attr]
 
 
 class NoDebugging(DebugControl):
@@ -424,7 +424,7 @@ def decorate_methods(
     private: bool = False,
 ) -> Callable[..., Any]:                                    # pragma: debugging
     """A class decorator to apply a decorator to methods."""
-    def _decorator(cls):                                    # type: ignore
+    def _decorator(cls):                                    # type: ignore[no-untyped-def]
         for name, meth in inspect.getmembers(cls, inspect.isroutine):
             if name not in cls.__dict__:
                 continue

coverage/files.py

@@ -73,7 +73,7 @@ def canonical_filename(filename: str) -> str:
         if not os.path.isabs(filename):
             for path in [os.curdir] + sys.path:
                 if path is None:
-                    continue # type: ignore
+                    continue # type: ignore[unreachable]
                 f = os.path.join(path, filename)
                 try:
                     exists = os.path.exists(f)

tests/test_annotate.py

@@ -43,15 +43,13 @@ def test_multi(self) -> None:
         cov = coverage.Coverage()
         self.start_import_stop(cov, "multi")
         cov.annotate()
-
         compare(gold_path("annotate/multi"), ".", "*,cover")
 
     def test_annotate_dir(self) -> None:
         self.make_multi()
         cov = coverage.Coverage(source=["."])
         self.start_import_stop(cov, "multi")
         cov.annotate(directory="out_anno_dir")
-
         compare(gold_path("annotate/anno_dir"), "out_anno_dir", "*,cover")
 
     def test_encoding(self) -> None: