Merge branch 'master' into feat/vendor-wcwidth

Author: deathaxe

pyte/__init__.py

@@ -25,14 +25,13 @@
 __all__ = ("Screen", "DiffScreen", "HistoryScreen", "DebugScreen",
            "Stream", "ByteStream")
 
-import io
-from typing import Union
-
 from .screens import Screen, DiffScreen, HistoryScreen, DebugScreen
 from .streams import Stream, ByteStream
 
 
 if __debug__:
+    import io
+
     def dis(chars: bytes | str) -> None:
         """A :func:`dis.dis` for terminals.
 

pyte/screens.py

@@ -35,8 +35,7 @@
 import warnings
 from collections import deque, defaultdict
 from functools import lru_cache
-from typing import Any, Dict, List, NamedTuple, Optional, Set, TextIO, TypeVar
-from collections.abc import Callable, Generator, Sequence
+from typing import TYPE_CHECKING, NamedTuple, TypeVar
 
 from . import (
     charsets as cs,
@@ -47,6 +46,9 @@
 from .streams import Stream
 from .wcwidth import wcwidth
 
+if TYPE_CHECKING:
+    from collections.abc import Callable, Generator, Sequence
+    from typing import Any, NamedTuple, TextIO
 
 KT = TypeVar("KT")
 VT = TypeVar("VT")

pyte/streams.py

@@ -25,17 +25,17 @@
 import re
 import warnings
 from collections import defaultdict
-from collections.abc import Mapping
-from typing import Any, Dict, Optional, TYPE_CHECKING
-from collections.abc import Callable, Generator
+from typing import TYPE_CHECKING
 
 from . import control as ctrl, escape as esc
 
 if TYPE_CHECKING:
+    from collections.abc import Callable, Generator, Mapping
+    from typing import Any
     from .screens import Screen
 
+    ParserGenerator = Generator[bool | None, str, None]
 
-ParserGenerator = Generator[Optional[bool], str, None]
 
 class Stream:
     """A stream is a state machine that parses a stream of bytes and