Make mypy happy

Author: tomasr8

Lib/_pyrepl/_module_completer.py

@@ -72,7 +72,7 @@ def __init__(self, namespace: Mapping[str, Any] | None = None) -> None:
         self._curr_sys_path: list[str] = sys.path[:]
         self._stdlib_path = os.path.dirname(importlib.__path__[0])
 
-    def get_completions(self, line: str) -> tuple[list[str], list[object], CompletionAction | None] | None:
+    def get_completions(self, line: str) -> tuple[list[str], list[Any], CompletionAction | None] | None:
         """Return the next possible import completions for 'line'.
 
         For attributes completion, if the module to complete from is not
@@ -89,7 +89,7 @@ def get_completions(self, line: str) -> tuple[list[str], list[object], Completio
             # no completions are available
             return [], [], None
 
-    def complete(self, from_name: str | None, name: str | None) -> tuple[list[str], list[object], CompletionAction | None]:
+    def complete(self, from_name: str | None, name: str | None) -> tuple[list[str], list[Any], CompletionAction | None]:
         if from_name is None:
             # import x.y.z<tab>
             assert name is not None
@@ -180,7 +180,7 @@ def _is_stdlib_module(self, module_info: pkgutil.ModuleInfo) -> bool:
         return (isinstance(module_info.module_finder, FileFinder)
                 and module_info.module_finder.path == self._stdlib_path)
 
-    def find_attributes(self, path: str, prefix: str) -> tuple[list[str], list[object], CompletionAction | None]:
+    def find_attributes(self, path: str, prefix: str) -> tuple[list[str], list[Any], CompletionAction | None]:
         """Find all attributes of module 'path' that start with 'prefix'."""
         attributes, values, action = self._find_attributes(path, prefix)
         # Filter out invalid attribute names
@@ -193,7 +193,7 @@ def find_attributes(self, path: str, prefix: str) -> tuple[list[str], list[objec
                 filtered_values.append(val)
         return filtered_names, filtered_values, action
 
-    def _find_attributes(self, path: str, prefix: str) -> tuple[list[str], list[object], CompletionAction | None]:
+    def _find_attributes(self, path: str, prefix: str) -> tuple[list[str], list[Any], CompletionAction | None]:
         path = self._resolve_relative_path(path)  # type: ignore[assignment]
         if path is None:
             return [], [], None

Lib/_pyrepl/fancycompleter.py

@@ -8,6 +8,12 @@
 import keyword
 import types
 
+TYPE_CHECKING = False
+
+if TYPE_CHECKING:
+    from typing import Any
+    from _colorize import Theme
+
 
 def safe_getattr(obj, name):
     # Mirror rlcompleter's safeguards so completion does not
@@ -21,13 +27,13 @@ def safe_getattr(obj, name):
     return getattr(obj, name, None)
 
 
-def colorize_matches(names, values, theme):
+def colorize_matches(names: list[str], values: list[Any], theme: Theme) -> list[str]:
     return [
         _color_for_obj(name, obj, theme)
         for name, obj in zip(names, values)
     ]
 
-def _color_for_obj(name, value, theme):
+def _color_for_obj(name: str, value: Any, theme: Theme) -> str:
     t = type(value)
     color = _color_by_type(t, theme)
     return f"{color}{name}{ANSIColors.RESET}"

Lib/_pyrepl/readline.py

@@ -104,7 +104,7 @@ class ReadlineConfig:
     readline_completer: Completer | None = None
     completer_delims: frozenset[str] = frozenset(" \t\n`~!@#$%^&*()-=+[{]}\\|;:'\",<>/?")
     module_completer: ModuleCompleter = field(default_factory=make_default_module_completer)
-    colorize_completions: Callable[[list[str], list[object]], list[str]] | None = None
+    colorize_completions: Callable[[list[str], list[Any]], list[str]] | None = None
 
 @dataclass(kw_only=True)
 class ReadlineAlikeReader(historical_reader.HistoricalReader, CompletingReader):
@@ -623,9 +623,10 @@ def _setup(namespace: Mapping[str, Any]) -> None:
     completer_cls = RLCompleter if use_basic_completer else FancyCompleter
     completer = completer_cls(namespace)
     _wrapper.config.readline_completer = completer.complete
-    if getattr(completer, 'use_colors', False):
+    if isinstance(completer, FancyCompleter) and completer.use_colors:
+        theme = completer.theme
         def _colorize(names: list[str], values: list[object]) -> list[str]:
-            return colorize_matches(names, values, completer.theme)
+            return colorize_matches(names, values, theme)
         _wrapper.config.colorize_completions = _colorize
     _wrapper.config.module_completer = ModuleCompleter(namespace)