fixes for mypy 1.11

asottile · asottile · commit a68a19d217d0 · 2024-07-28T14:57:13.000-04:00
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -40,5 +40,5 @@ repos:
     rev: v1.11.0
     hooks:
     -   id: mypy
-        additional_dependencies: [types-all]
+        additional_dependencies: [types-pyyaml]
         exclude: ^testing/resources/
diff --git a/pre_commit/util.py b/pre_commit/util.py
@@ -205,7 +205,7 @@ def cmd_output_p(
 def _handle_readonly(
         func: Callable[[str], object],
         path: str,
-        exc: Exception,
+        exc: BaseException,
 ) -> None:
     if (
             func in (os.rmdir, os.remove, os.unlink) and
@@ -223,7 +223,7 @@ def _handle_readonly(
     def _handle_readonly_old(
         func: Callable[[str], object],
         path: str,
-        excinfo: tuple[type[Exception], Exception, TracebackType],
+        excinfo: tuple[type[BaseException], BaseException, TracebackType],
     ) -> None:
         return _handle_readonly(func, path, excinfo[1])
 
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -209,36 +209,25 @@ def log_info_mock():
         yield mck
 
 
-class FakeStream:
-    def __init__(self):
-        self.data = io.BytesIO()
-
-    def write(self, s):
-        self.data.write(s)
-
-    def flush(self):
-        pass
-
-
 class Fixture:
-    def __init__(self, stream):
+    def __init__(self, stream: io.BytesIO) -> None:
         self._stream = stream
 
-    def get_bytes(self):
+    def get_bytes(self) -> bytes:
         """Get the output as-if no encoding occurred"""
-        data = self._stream.data.getvalue()
-        self._stream.data.seek(0)
-        self._stream.data.truncate()
+        data = self._stream.getvalue()
+        self._stream.seek(0)
+        self._stream.truncate()
         return data.replace(b'\r\n', b'\n')
 
-    def get(self):
+    def get(self) -> str:
         """Get the output assuming it was written as UTF-8 bytes"""
         return self.get_bytes().decode()
 
 
 @pytest.fixture
 def cap_out():
-    stream = FakeStream()
+    stream = io.BytesIO()
     write = functools.partial(output.write, stream=stream)
     write_line_b = functools.partial(output.write_line_b, stream=stream)
     with mock.patch.multiple(output, write=write, write_line_b=write_line_b):
