remove usage of cabc in _click classes

Author: svlandeg

typer/_click/_compat.py

@@ -1,12 +1,12 @@
 from __future__ import annotations
 
 import codecs
-import collections.abc as cabc
 import io
 import os
 import re
 import sys
 import typing as t
+from collections.abc import Mapping, MutableMapping
 from types import TracebackType
 from weakref import WeakKeyDictionary
 
@@ -517,7 +517,7 @@ def _get_argv_encoding() -> str:
 
         return locale.getpreferredencoding()
 
-    _ansi_stream_wrappers: cabc.MutableMapping[t.TextIO, t.TextIO] = WeakKeyDictionary()
+    _ansi_stream_wrappers: MutableMapping[t.TextIO, t.TextIO] = WeakKeyDictionary()
 
     def auto_wrap_for_ansi(stream: t.TextIO, color: bool | None = None) -> t.TextIO:
         """Support ANSI color and style codes on Windows by wrapping a
@@ -580,7 +580,7 @@ def _make_cached_stream_func(
     src_func: t.Callable[[], t.TextIO | None],
     wrapper_func: t.Callable[[], t.TextIO],
 ) -> t.Callable[[], t.TextIO | None]:
-    cache: cabc.MutableMapping[t.TextIO, t.TextIO] = WeakKeyDictionary()
+    cache: MutableMapping[t.TextIO, t.TextIO] = WeakKeyDictionary()
 
     def func() -> t.TextIO | None:
         stream = src_func()
@@ -609,13 +609,13 @@ def func() -> t.TextIO | None:
 _default_text_stderr = _make_cached_stream_func(lambda: sys.stderr, get_text_stderr)
 
 
-binary_streams: cabc.Mapping[str, t.Callable[[], t.BinaryIO]] = {
+binary_streams: Mapping[str, t.Callable[[], t.BinaryIO]] = {
     "stdin": get_binary_stdin,
     "stdout": get_binary_stdout,
     "stderr": get_binary_stderr,
 }
 
-text_streams: cabc.Mapping[str, t.Callable[[str | None, str | None], t.TextIO]] = {
+text_streams: Mapping[str, t.Callable[[str | None, str | None], t.TextIO]] = {
     "stdin": get_text_stdin,
     "stdout": get_text_stdout,
     "stderr": get_text_stderr,

typer/_click/_termui_impl.py

@@ -6,13 +6,13 @@
 
 from __future__ import annotations
 
-import collections.abc as cabc
 import contextlib
 import math
 import os
 import sys
 import time
 import typing as t
+from collections.abc import Iterable, Iterator
 from io import StringIO
 from types import TracebackType
 
@@ -39,7 +39,7 @@
 class ProgressBar(t.Generic[V]):
     def __init__(
         self,
-        iterable: cabc.Iterable[V] | None,
+        iterable: Iterable[V] | None,
         length: int | None = None,
         fill_char: str = "#",
         empty_char: str = " ",
@@ -92,8 +92,8 @@ def __init__(
         if iterable is None:
             if length is None:
                 raise TypeError("iterable or length is required")
-            iterable = t.cast("cabc.Iterable[V]", range(length))
-        self.iter: cabc.Iterable[V] = iter(iterable)
+            iterable = t.cast("Iterable[V]", range(length))
+        self.iter: Iterable[V] = iter(iterable)
         self.length = length
         self.pos: int = 0
         self.avg: list[float] = []
@@ -121,7 +121,7 @@ def __exit__(
     ) -> None:
         self.render_finish()
 
-    def __iter__(self) -> cabc.Iterator[V]:
+    def __iter__(self) -> Iterator[V]:
         if not self.entered:
             raise RuntimeError("You need to use progress bars in a with block.")
         self.render_progress()
@@ -328,7 +328,7 @@ def finish(self) -> None:
         self.current_item = None
         self.finished = True
 
-    def generator(self) -> cabc.Iterator[V]:
+    def generator(self) -> Iterator[V]:
         """Return a generator which yields the items added to the bar
         during construction, and updates the progress bar *after* the
         yielded block returns.
@@ -450,7 +450,7 @@ def _translate_ch_to_exc(ch: str) -> None:
     import msvcrt
 
     @contextlib.contextmanager
-    def raw_terminal() -> cabc.Iterator[int]:
+    def raw_terminal() -> Iterator[int]:
         yield -1
 
     def getchar(echo: bool) -> str:
@@ -504,7 +504,7 @@ def getchar(echo: bool) -> str:
     import tty
 
     @contextlib.contextmanager
-    def raw_terminal() -> cabc.Iterator[int]:
+    def raw_terminal() -> Iterator[int]:
         f: t.TextIO | None
         fd: int
 

typer/_click/_textwrap.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
-import collections.abc as cabc
 import textwrap
+from collections.abc import Iterator
 from contextlib import contextmanager
 
 
@@ -25,7 +25,7 @@ def _handle_long_word(
             cur_line.append(reversed_chunks.pop())
 
     @contextmanager
-    def extra_indent(self, indent: str) -> cabc.Iterator[None]:
+    def extra_indent(self, indent: str) -> Iterator[None]:
         old_initial_indent = self.initial_indent
         old_subsequent_indent = self.subsequent_indent
         self.initial_indent += indent

typer/_click/_winconsole.py

@@ -8,7 +8,6 @@
 # echo and prompt.
 from __future__ import annotations
 
-import collections.abc as cabc
 import io
 import sys
 import time
@@ -207,7 +206,7 @@ def write(self, x: t.AnyStr) -> int:
             pass
         return self.buffer.write(x)
 
-    def writelines(self, lines: cabc.Iterable[t.AnyStr]) -> None:
+    def writelines(self, lines: t.Iterable[t.AnyStr]) -> None:
         for line in lines:
             self.write(line)
 
@@ -251,7 +250,7 @@ def _get_text_stderr(buffer_stream: t.BinaryIO) -> t.TextIO:
     return t.cast(t.TextIO, ConsoleStream(text_stream, buffer_stream))
 
 
-_stream_factories: cabc.Mapping[int, t.Callable[[t.BinaryIO], t.TextIO]] = {
+_stream_factories: t.Mapping[int, t.Callable[[t.BinaryIO], t.TextIO]] = {
     0: _get_text_stdin,
     1: _get_text_stdout,
     2: _get_text_stderr,

typer/_click/core.py

@@ -1,9 +1,8 @@
-import collections.abc as cabc
 import enum
 import inspect
 import os
 from abc import ABC, abstractmethod
-from collections.abc import Callable
+from collections.abc import Callable, Iterator, Mapping, MutableMapping, Sequence
 from contextlib import AbstractContextManager, ExitStack, contextmanager
 from types import TracebackType
 from typing import (
@@ -45,7 +44,7 @@
 
 def _complete_visible_commands(
     ctx: "Context", incomplete: str
-) -> cabc.Iterator[tuple[str, "Command"]]:
+) -> Iterator[tuple[str, "Command"]]:
     """List all the subcommands of a group that start with the
     incomplete value and aren't hidden.
     """
@@ -65,7 +64,7 @@ def _complete_visible_commands(
 @contextmanager
 def augment_usage_errors(
     ctx: "Context", param: Union["Parameter", None] = None
-) -> cabc.Iterator[None]:
+) -> Iterator[None]:
     """Context manager that attaches extra information to exceptions."""
     try:
         yield
@@ -82,8 +81,8 @@ def augment_usage_errors(
 
 
 def iter_params_for_processing(
-    invocation_order: cabc.Sequence["Parameter"],
-    declaration_order: cabc.Sequence["Parameter"],
+    invocation_order: Sequence["Parameter"],
+    declaration_order: Sequence["Parameter"],
 ) -> list["Parameter"]:
     """Returns all declared parameters in the order they should be processed.
 
@@ -147,7 +146,7 @@ def __init__(
         info_name: str | None = None,
         obj: Any | None = None,
         auto_envvar_prefix: str | None = None,
-        default_map: cabc.MutableMapping[str, Any] | None = None,
+        default_map: MutableMapping[str, Any] | None = None,
         terminal_width: int | None = None,
         max_content_width: int | None = None,
         resilient_parsing: bool = False,
@@ -186,7 +185,7 @@ def __init__(
         ):
             default_map = parent.default_map.get(info_name)
 
-        self.default_map: cabc.MutableMapping[str, Any] | None = default_map
+        self.default_map: MutableMapping[str, Any] | None = default_map
 
         # This flag indicates if a subcommand is going to be executed.
         self.invoked_subcommand: str | None = None
@@ -291,7 +290,7 @@ def __exit__(
         return exit_result
 
     @contextmanager
-    def scope(self, cleanup: bool = True) -> cabc.Iterator["Context"]:
+    def scope(self, cleanup: bool = True) -> Iterator["Context"]:
         """This helper method can be used with the context object to promote
         it to the current thread local (see `get_current_context`).
         The default behavior of this is to invoke the cleanup functions which
@@ -524,7 +523,7 @@ class Command(ABC):
     def __init__(
         self,
         name: str | None,
-        context_settings: cabc.MutableMapping[str, Any] | None = None,
+        context_settings: MutableMapping[str, Any] | None = None,
         callback: Callable[..., Any] | None = None,
         params: list["Parameter"] | None = None,
         help: str | None = None,
@@ -541,7 +540,7 @@ def __init__(
         if context_settings is None:
             context_settings = {}
 
-        self.context_settings: cabc.MutableMapping[str, Any] = context_settings
+        self.context_settings: MutableMapping[str, Any] = context_settings
 
         self.callback = callback
         self.params: list[Parameter] = params or []
@@ -788,7 +787,7 @@ def shell_complete(self, ctx: Context, incomplete: str) -> list["CompletionItem"
     @abstractmethod
     def main(
         self,
-        args: cabc.Sequence[str] | None = None,
+        args: Sequence[str] | None = None,
         prog_name: str | None = None,
         complete_var: str | None = None,
         standalone_mode: bool = True,
@@ -800,7 +799,7 @@ def main(
     @abstractmethod
     def _main_shell_completion(
         self,
-        ctx_args: cabc.MutableMapping[str, Any],
+        ctx_args: MutableMapping[str, Any],
         prog_name: str,
         complete_var: str | None = None,
     ) -> None:
@@ -824,7 +823,7 @@ class Parameter(ABC):
 
     def __init__(
         self,
-        param_decls: cabc.Sequence[str] | None = None,
+        param_decls: Sequence[str] | None = None,
         type: types.ParamType | Any | None = None,
         required: bool = False,
         default: Any | Callable[[], Any] | None = None,
@@ -834,7 +833,7 @@ def __init__(
         metavar: str | None = None,
         expose_value: bool = True,
         is_eager: bool = False,
-        envvar: str | cabc.Sequence[str] | None = None,
+        envvar: str | Sequence[str] | None = None,
         shell_complete: Callable[
             [Context, "Parameter", str], list["CompletionItem"] | list[str]
         ]
@@ -872,7 +871,7 @@ def __repr__(self) -> str:
 
     @abstractmethod
     def _parse_decls(
-        self, decls: cabc.Sequence[str], expose_value: bool
+        self, decls: Sequence[str], expose_value: bool
     ) -> tuple[str | None, list[str], list[str]]:
         pass  # pragma: no cover
 
@@ -924,7 +923,7 @@ def add_to_parser(self, parser: _OptionParser, ctx: Context) -> None:
         pass  # pragma: no cover
 
     def consume_value(
-        self, ctx: Context, opts: cabc.Mapping[str, Any]
+        self, ctx: Context, opts: Mapping[str, Any]
     ) -> tuple[Any, ParameterSource]:
         value = opts.get(self.name)  # type: ignore
         source = ParameterSource.COMMANDLINE
@@ -950,7 +949,7 @@ def type_cast_value(self, ctx: Context, value: Any) -> Any:
         if value is None:
             return () if self.multiple or self.nargs == -1 else None
 
-        def check_iter(value: Any) -> cabc.Iterator[Any]:
+        def check_iter(value: Any) -> Iterator[Any]:
             assert not isinstance(value, str)
             return iter(value)
 
@@ -1037,7 +1036,7 @@ def resolve_envvar_value(self, ctx: Context) -> str | None:
 
         return None
 
-    def value_from_envvar(self, ctx: Context) -> str | cabc.Sequence[str] | None:
+    def value_from_envvar(self, ctx: Context) -> str | Sequence[str] | None:
         """Process the raw environment variable string for this parameter.
 
         Returns the string as-is or splits it into a sequence of strings if the
@@ -1052,7 +1051,7 @@ def value_from_envvar(self, ctx: Context) -> str | cabc.Sequence[str] | None:
         return rv
 
     def handle_parse_result(
-        self, ctx: Context, opts: cabc.Mapping[str, Any], args: list[str]
+        self, ctx: Context, opts: Mapping[str, Any], args: list[str]
     ) -> tuple[Any, list[str]]:
         """Process the value produced by the parser from user input.
 

typer/_click/exceptions.py

@@ -13,7 +13,7 @@
     from .core import Command, Context, Parameter
 
 
-def _join_param_hints(param_hint: cabc.Sequence[str] | str | None) -> str | None:
+def _join_param_hints(param_hint: t.Sequence[str] | str | None) -> str | None:
     if param_hint is not None and not isinstance(param_hint, str):
         return " / ".join(repr(x) for x in param_hint)
 

typer/_click/termui.py

@@ -1,6 +1,5 @@
-import collections.abc as cabc
 import io
-from collections.abc import Callable
+from collections.abc import Callable, Iterable
 from contextlib import AbstractContextManager
 from typing import IO, TYPE_CHECKING, Any, AnyStr, TextIO, TypeVar, overload
 
@@ -216,7 +215,7 @@ def progressbar(
 
 @overload
 def progressbar(
-    iterable: cabc.Iterable[V] | None = None,
+    iterable: Iterable[V] | None = None,
     length: int | None = None,
     label: str | None = None,
     hidden: bool = False,
@@ -236,7 +235,7 @@ def progressbar(
 
 
 def progressbar(
-    iterable: cabc.Iterable[V] | None = None,
+    iterable: Iterable[V] | None = None,
     length: int | None = None,
     label: str | None = None,
     hidden: bool = False,