Remove unnecessary type: ignore comments

The rapid pace of changes in typing across our dependencies has slowed,
so now is the time to enable the 'warn_unused_ignores' option. Doing so
highlights a few now-unnecessary comments.

Signed-off-by: Stephen Finucane <stephen@that.guru>

Author: stephenfin

pyproject.toml

@@ -63,9 +63,7 @@ python_version = "3.10"
 show_column_numbers = true
 show_error_context = true
 strict = true
-# this is here temporarily due to the rapid changes in typing across
-# dependencies
-warn_unused_ignores = false
+warn_unused_ignores = true
 # FIXME(stephenfin): We should remove this
 implicit_reexport = true
 exclude = 'doc'

testtools/compat.py

@@ -139,16 +139,19 @@ def unicode_output_stream(stream: IO[str]) -> IO[str]:
         # already a TextIO [which in the io library has no encoding
         # attribute).
         return stream
+
     try:
         writer = codecs.getwriter(stream.encoding or "")  # type: ignore[attr-defined]
     except (AttributeError, LookupError):
         return codecs.getwriter("ascii")(stream, "replace")  # type: ignore[arg-type, return-value]
+
     if writer.__module__.rsplit(".", 1)[1].startswith("utf"):
         # The current stream has a unicode encoding so no error handler is needed
         return stream
+
     # Python 3 doesn't seem to make this easy, handle a common case
     try:
-        return stream.__class__(  # type: ignore[call-arg, return-value]
+        return stream.__class__(  # type: ignore[call-arg]
             stream.buffer,  # type: ignore[attr-defined]
             stream.encoding,  # type: ignore[attr-defined]
             "replace",
@@ -157,4 +160,5 @@ def unicode_output_stream(stream: IO[str]) -> IO[str]:
         )
     except AttributeError:
         pass
+
     return writer(stream, "replace")  # type: ignore[arg-type, return-value]

testtools/matchers/_dict.py

@@ -78,8 +78,8 @@ def _dict_to_mismatch(
     result_mismatch: "Callable[[dict[K, Mismatch]], Mismatch]" = DictMismatches,
 ) -> Mismatch | None:
     if to_mismatch:
-        data = map_values(to_mismatch, data)  # type: ignore[arg-type,assignment]
-    mismatches = filter_values(bool, data)  # type: ignore[arg-type]
+        data = map_values(to_mismatch, data)  # type: ignore[arg-type]
+    mismatches = filter_values(bool, data)
     if mismatches:
         return result_mismatch(mismatches)  # type: ignore[arg-type]
     return None

testtools/matchers/_exception.py

@@ -134,7 +134,7 @@ def match(self, matchee: "Callable[[], object]") -> Mismatch | None:
             # Handle staticmethod objects by extracting the underlying function
             actual_callable: Callable[[], object]
             if isinstance(matchee, staticmethod):
-                actual_callable = matchee.__func__  # type: ignore[assignment]
+                actual_callable = matchee.__func__
             else:
                 actual_callable = matchee
             result = actual_callable()
@@ -146,7 +146,7 @@ def match(self, matchee: "Callable[[], object]") -> Mismatch | None:
             # Type narrow to actual ExcInfo
             assert exc_info[0] is not None
             assert exc_info[1] is not None
-            typed_exc_info: ExcInfo = (exc_info[0], exc_info[1], exc_info[2])  # type: ignore[assignment]
+            typed_exc_info: ExcInfo = (exc_info[0], exc_info[1], exc_info[2])
 
             if self.exception_matcher:
                 mismatch = self.exception_matcher.match(typed_exc_info)

testtools/testresult/real.py

@@ -2186,7 +2186,7 @@ def stopTest(self, test: unittest.TestCase) -> None:
             self._tags = self._tags.parent
         self.decorated.stopTest(test)
 
-    def stopTestRun(self) -> object:  # type: ignore[override]
+    def stopTestRun(self) -> object:
         try:
             return self.decorated.stopTestRun()
         except AttributeError:

testtools/testsuite.py

@@ -126,8 +126,7 @@ def run(
             semaphore = threading.Semaphore(1)
             for i, test in enumerate(tests):
                 process_result = self._wrap_result(
-                    testtools.ThreadsafeForwardingResult(result, semaphore),
-                    i,  # type: ignore[no-untyped-call]
+                    testtools.ThreadsafeForwardingResult(result, semaphore), i
                 )
                 reader_thread = threading.Thread(
                     target=self._run_test, args=(test, process_result, queue)