Fix type and import checking

Author: vxgmichel

prompt_toolkit/contrib/telnet/protocol.py

@@ -131,9 +131,9 @@ def ttype(self, data: bytes) -> None:
  """
  Received terminal type.
  """
- subcmd, ttype = data[0:1], data[1:]
+ subcmd, data = data[0:1], data[1:]
  if subcmd == IS:
- ttype = ttype.decode("ascii")
+ ttype = data.decode("ascii")
  self.ttype_received_callback(ttype)
  else:
  logger.warning("Received a non-IS terminal type Subnegotiation")

prompt_toolkit/contrib/telnet/server.py

@@ -26,10 +26,10 @@
  NAWS,
  SB,
  SE,
+ SEND,
  SUPPRESS_GO_AHEAD,
- WILL,
  TTYPE,
- SEND,
+ WILL,
  TelnetProtocolParser,
 )
 
@@ -132,7 +132,6 @@ def __init__(
  _initialize_telnet(conn)
 
  # Create input.
- self.vt100_output = None
  self.vt100_input = create_pipe_input()
 
  # Create output.

prompt_toolkit/input/base.py

@@ -95,6 +95,20 @@ def close(self) -> None:
  pass
 
 
+class PipeInput(Input):
+ """
+ Abstraction for pipe input.
+ """
+
+ @abstractmethod
+ def send_bytes(self, data: bytes) -> None:
+ """Feed byte string into the pipe"""
+
+ @abstractmethod
+ def send_text(self, data: str) -> None:
+ """Feed a text string into the pipe"""
+
+
 class DummyInput(Input):
  """
  Input for use in a `DummyApplication`

prompt_toolkit/input/defaults.py

@@ -3,7 +3,7 @@
 
 from prompt_toolkit.utils import is_windows
 
-from .base import Input
+from .base import Input, PipeInput
 
 __all__ = [
  "create_input",
@@ -43,7 +43,7 @@ def create_input(
  return Vt100Input(stdin)
 
 
-def create_pipe_input(responds_to_cpr: bool = True) -> Input:
+def create_pipe_input(responds_to_cpr: bool = True) -> PipeInput:
  """
  Create an input pipe.
  This is mostly useful for unit testing.

prompt_toolkit/input/posix_pipe.py

@@ -2,14 +2,15 @@
 from typing import ContextManager, TextIO, cast
 
 from ..utils import DummyContext
+from .base import PipeInput
 from .vt100 import Vt100Input
 
 __all__ = [
  "PosixPipeInput",
 ]
 
 
-class PosixPipeInput(Vt100Input):
+class PosixPipeInput(Vt100Input, PipeInput):
  """
  Input that is send through a pipe.
  This is useful if we want to send the input programmatically into the

prompt_toolkit/input/win32_pipe.py

@@ -5,13 +5,14 @@
 
 from ..key_binding import KeyPress
 from ..utils import DummyContext
+from .base import PipeInput
 from .vt100_parser import Vt100Parser
 from .win32 import _Win32InputBase, attach_win32_input, detach_win32_input
 
 __all__ = ["Win32PipeInput"]
 
 
-class Win32PipeInput(_Win32InputBase):
+class Win32PipeInput(_Win32InputBase, PipeInput):
  """
  This is an input pipe that works on Windows.
  Text or bytes can be feed into the pipe, and key strokes can be read from

prompt_toolkit/output/color_depth.py

@@ -1,9 +1,13 @@
 import os
 from enum import Enum
-from typing import Optional
+from typing import TYPE_CHECKING, Optional
 
 from prompt_toolkit.utils import is_dumb_terminal, is_windows
 
+if TYPE_CHECKING:
+ from base import Output
+
+
 __all__ = [
  "ColorDepth",
 ]
@@ -35,7 +39,7 @@ class ColorDepth(str, Enum):
  TRUE_COLOR = DEPTH_24_BIT
 
  @classmethod
- def default(cls, output: Optional[Output] = None) -> "ColorDepth":
+ def default(cls, output: Optional["Output"] = None) -> "ColorDepth":
  """
  Return the default color depth, according to the provided output.
 
@@ -65,7 +69,8 @@ def default(cls, output: Optional[Output] = None) -> "ColorDepth":
  # vt100 escape sequences with ENABLE_VIRTUAL_TERMINAL_PROCESSING are
  # supported. We don't have a reliable way yet to know whether our
  # console supports true color or only 4-bit.
- if output.is_windows() and "PROMPT_TOOLKIT_COLOR_DEPTH" not in os.environ:
+ windows = output.is_windows() if output is not None else is_windows()
+ if windows and "PROMPT_TOOLKIT_COLOR_DEPTH" not in os.environ:
  return cls.DEPTH_4_BIT
 
  # Check the `PROMPT_TOOLKIT_COLOR_DEPTH` environment variable.