Merge pull request #517 from gerlero/typing

Update typing

Author: gerlero

foamlib/_cases/_run.py

@@ -8,11 +8,7 @@
 from abc import abstractmethod
 from contextlib import contextmanager
 from pathlib import Path
-from typing import IO, TYPE_CHECKING, Any
-
-from rich.progress import Progress
-
-from ._util import SingletonContextManager
+from typing import TYPE_CHECKING, Any
 
 if sys.version_info >= (3, 9):
     from collections.abc import (
@@ -33,6 +29,13 @@
         Sequence,
     )
 
+if TYPE_CHECKING:
+    from io import TextIOBase
+
+from rich.progress import Progress
+
+from ._util import SingletonContextManager
+
 if sys.version_info >= (3, 11):
     from typing import Self
 else:
@@ -278,7 +281,7 @@ def __cmd_name(cmd: Sequence[str | os.PathLike[str]] | str) -> str:
     @contextmanager
     def __output(
         self, cmd: Sequence[str | os.PathLike[str]] | str, *, log: bool
-    ) -> Generator[tuple[int | IO[str], int | IO[str]], None, None]:
+    ) -> Generator[tuple[int | TextIOBase, int | TextIOBase], None, None]:
         if log:
             with (self.path / f"log.{self.__cmd_name(cmd)}").open("a") as stdout:
                 yield stdout, STDOUT

foamlib/_cases/_subprocess.py

@@ -7,7 +7,7 @@
 import subprocess
 import sys
 import time
-from io import StringIO
+from io import StringIO, TextIOBase
 from pathlib import Path
 
 if sys.version_info >= (3, 9):
@@ -68,8 +68,8 @@ def run_sync(
     *,
     case: Path,
     check: bool = True,
-    stdout: int | StringIO = DEVNULL,
-    stderr: int | StringIO = STDOUT,
+    stdout: int | TextIOBase = DEVNULL,
+    stderr: int | TextIOBase = STDOUT,
     process_stdout: Callable[[str], None] = lambda _: None,
 ) -> CompletedProcess[str]:
     # Set up log file monitoring
@@ -146,8 +146,8 @@ async def run_async(
     *,
     case: Path,
     check: bool = True,
-    stdout: int | StringIO = DEVNULL,
-    stderr: int | StringIO = STDOUT,
+    stdout: int | TextIOBase = DEVNULL,
+    stderr: int | TextIOBase = STDOUT,
     process_stdout: Callable[[str], None] = lambda _: None,
 ) -> CompletedProcess[str]:
     # Set up log file monitoring