Added more precise types in various places.

Author: jonathanslenders

ptpython/completer.py

@@ -4,7 +4,7 @@
 import keyword
 import re
 from enum import Enum
-from typing import TYPE_CHECKING, Any, Callable, Dict, Iterable, List, Optional
+from typing import TYPE_CHECKING, Any, Callable, Dict, Iterable, List, Optional, Tuple
 
 from prompt_toolkit.completion import (
     CompleteEvent,
@@ -21,6 +21,7 @@
 from ptpython.utils import get_jedi_script_from_document
 
 if TYPE_CHECKING:
+    import jedi.api.classes
     from prompt_toolkit.contrib.regular_languages.compiler import _CompiledGrammar
 
 __all__ = ["PythonCompleter", "CompletePrivateAttributes", "HidePrivateCompleter"]
@@ -43,8 +44,8 @@ class PythonCompleter(Completer):
 
     def __init__(
         self,
-        get_globals: Callable[[], dict],
-        get_locals: Callable[[], dict],
+        get_globals: Callable[[], Dict[str, Any]],
+        get_locals: Callable[[], Dict[str, Any]],
         enable_dictionary_completion: Callable[[], bool],
     ) -> None:
         super().__init__()
@@ -200,7 +201,11 @@ class JediCompleter(Completer):
     Autocompleter that uses the Jedi library.
     """
 
-    def __init__(self, get_globals, get_locals) -> None:
+    def __init__(
+        self,
+        get_globals: Callable[[], Dict[str, Any]],
+        get_locals: Callable[[], Dict[str, Any]],
+    ) -> None:
         super().__init__()
 
         self.get_globals = get_globals
@@ -296,7 +301,11 @@ class DictionaryCompleter(Completer):
              function calls, so it only triggers attribute access.
     """
 
-    def __init__(self, get_globals, get_locals):
+    def __init__(
+        self,
+        get_globals: Callable[[], Dict[str, Any]],
+        get_locals: Callable[[], Dict[str, Any]],
+    ) -> None:
         super().__init__()
 
         self.get_globals = get_globals
@@ -574,7 +583,7 @@ def _sort_attribute_names(self, names: List[str]) -> List[str]:
         underscore names to the end.
         """
 
-        def sort_key(name: str):
+        def sort_key(name: str) -> Tuple[int, str]:
             if name.startswith("__"):
                 return (2, name)  # Double underscore comes latest.
             if name.startswith("_"):
@@ -639,7 +648,9 @@ class ReprFailedError(Exception):
     _builtin_names = []
 
 
-def _get_style_for_jedi_completion(jedi_completion) -> str:
+def _get_style_for_jedi_completion(
+    jedi_completion: "jedi.api.classes.Completion",
+) -> str:
     """
     Return completion style to use for this name.
     """

ptpython/entry_points/run_ptpython.py

@@ -26,16 +26,16 @@
 import pathlib
 import sys
 from textwrap import dedent
-from typing import Tuple
+from typing import IO, Optional, Tuple
 
 import appdirs
 from prompt_toolkit.formatted_text import HTML
 from prompt_toolkit.shortcuts import print_formatted_text
 
-from ptpython.repl import embed, enable_deprecation_warnings, run_config
+from ptpython.repl import PythonRepl, embed, enable_deprecation_warnings, run_config
 
 try:
-    from importlib import metadata
+    from importlib import metadata  # type: ignore
 except ImportError:
     import importlib_metadata as metadata  # type: ignore
 
@@ -44,7 +44,7 @@
 
 
 class _Parser(argparse.ArgumentParser):
-    def print_help(self):
+    def print_help(self, file: Optional[IO[str]] = None) -> None:
         super().print_help()
         print(
             dedent(
@@ -84,7 +84,7 @@ def create_parser() -> _Parser:
         "-V",
         "--version",
         action="version",
-        version=metadata.version("ptpython"),  # type: ignore
+        version=metadata.version("ptpython"),
     )
     parser.add_argument("args", nargs="*", help="Script and arguments")
     return parser
@@ -190,7 +190,7 @@ def run() -> None:
         enable_deprecation_warnings()
 
         # Apply config file
-        def configure(repl) -> None:
+        def configure(repl: PythonRepl) -> None:
             if os.path.exists(config_file):
                 run_config(repl, config_file)
 

ptpython/eventloop.py

@@ -10,10 +10,12 @@
 import sys
 import time
 
+from prompt_toolkit.eventloop import InputHookContext
+
 __all__ = ["inputhook"]
 
 
-def _inputhook_tk(inputhook_context):
+def _inputhook_tk(inputhook_context: InputHookContext) -> None:
     """
     Inputhook for Tk.
     Run the Tk eventloop until prompt-toolkit needs to process the next input.
@@ -23,9 +25,9 @@ def _inputhook_tk(inputhook_context):
 
     import _tkinter  # Keep this imports inline!
 
-    root = tkinter._default_root
+    root = tkinter._default_root  # type: ignore
 
-    def wait_using_filehandler():
+    def wait_using_filehandler() -> None:
         """
         Run the TK eventloop until the file handler that we got from the
         inputhook becomes readable.
@@ -34,7 +36,7 @@ def wait_using_filehandler():
         # to process.
         stop = [False]
 
-        def done(*a):
+        def done(*a: object) -> None:
             stop[0] = True
 
         root.createfilehandler(inputhook_context.fileno(), _tkinter.READABLE, done)
@@ -46,7 +48,7 @@ def done(*a):
 
         root.deletefilehandler(inputhook_context.fileno())
 
-    def wait_using_polling():
+    def wait_using_polling() -> None:
         """
         Windows TK doesn't support 'createfilehandler'.
         So, run the TK eventloop and poll until input is ready.
@@ -65,7 +67,7 @@ def wait_using_polling():
             wait_using_polling()
 
 
-def inputhook(inputhook_context):
+def inputhook(inputhook_context: InputHookContext) -> None:
     # Only call the real input hook when the 'Tkinter' library was loaded.
     if "Tkinter" in sys.modules or "tkinter" in sys.modules:
         _inputhook_tk(inputhook_context)