Turn FuncProps into a dataclass

sebastinas · sebastinas · commit d42b21aaef45 · 2022-08-28T18:09:23.000+02:00
diff --git a/bpython/autocomplete.py b/bpython/autocomplete.py
@@ -570,11 +570,11 @@ def matches(
 
         matches = {
             f"{name}="
-            for name in argspec[1][0]
+            for name in argspec.argspec[0]
             if isinstance(name, str) and name.startswith(r.word)
         }
         matches.update(
-            name + "=" for name in argspec[1][4] if name.startswith(r.word)
+            name + "=" for name in argspec.argspec[4] if name.startswith(r.word)
         )
         return matches if matches else None
 
@@ -711,7 +711,7 @@ def get_completer(
     line is a string of the current line
     kwargs (all optional):
         locals_ is a dictionary of the environment
-        argspec is an inspect.ArgSpec instance for the current function where
+        argspec is an inspect.FuncProps instance for the current function where
             the cursor is
         current_block is the possibly multiline not-yet-evaluated block of
             code which the current line is part of
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -101,7 +101,7 @@
 from . import translations
 from .translations import _
 
-from . import repl
+from . import repl, inspection
 from . import args as bpargs
 from .pager import page
 from .args import parse as argsparse
@@ -726,7 +726,7 @@ def lf(self) -> None:
 
     def mkargspec(
         self,
-        topline: Any,  # Named tuples don't seem to play nice with mypy
+        topline: inspection.FuncProps,
         in_arg: Union[str, int, None],
         down: bool,
     ) -> int:
@@ -1298,7 +1298,7 @@ def show_list(
         self,
         items: List[str],
         arg_pos: Union[str, int, None],
-        topline: Any = None,  # Named tuples don't play nice with mypy
+        topline: Optional[inspection.FuncProps] = None,
         formatter: Optional[Callable] = None,
         current_item: Union[str, Literal[False]] = None,
     ) -> None:
diff --git a/bpython/inspection.py b/bpython/inspection.py
@@ -26,7 +26,8 @@
 import pydoc
 import re
 from collections import namedtuple
-from typing import Any, Optional, Type, Dict, List
+from dataclasses import dataclass
+from typing import Any, Callable, Optional, Type, Dict, List
 from types import MemberDescriptorType, TracebackType
 from ._typing_compat import Literal
 
@@ -35,6 +36,7 @@
 
 from .lazyre import LazyReCompile
 
+
 ArgSpec = namedtuple(
     "ArgSpec",
     [
@@ -48,7 +50,12 @@
     ],
 )
 
-FuncProps = namedtuple("FuncProps", ["func", "argspec", "is_bound_method"])
+
+@dataclass
+class FuncProps:
+    func: str
+    argspec: ArgSpec
+    is_bound_method: bool
 
 
 class AttrCleaner:
@@ -112,10 +119,10 @@ class _Repr:
     Helper for `fixlongargs()`: Returns the given value in `__repr__()`.
     """
 
-    def __init__(self, value):
+    def __init__(self, value: str) -> None:
         self.value = value
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return self.value
 
     __str__ = __repr__
diff --git a/bpython/test/test_autocomplete.py b/bpython/test/test_autocomplete.py
@@ -11,7 +11,7 @@
 except ImportError:
     has_jedi = False
 
-from bpython import autocomplete
+from bpython import autocomplete, inspection
 from bpython.line import LinePart
 
 glob_function = "glob.iglob"
@@ -418,8 +418,8 @@ def test_set_of_params_returns_when_matches_found(self):
         def func(apple, apricot, banana, carrot):
             pass
 
-        argspec = list(inspect.getfullargspec(func))
-        argspec = ["func", argspec, False]
+        argspec = inspection.ArgSpec(*inspect.getfullargspec(func))
+        argspec = inspection.FuncProps("func", argspec, False)
         com = autocomplete.ParameterNameCompletion()
         self.assertSetEqual(
             com.matches(1, "a", argspec=argspec), {"apple=", "apricot="}
diff --git a/bpython/urwid.py b/bpython/urwid.py
@@ -762,7 +762,9 @@ def _populate_completion(self):
         if self.complete():
             if self.funcprops:
                 # This is mostly just stolen from the cli module.
-                func_name, args, is_bound = self.funcprops
+                func_name = self.funcprops.func
+                args = self.funcprops.argspec
+                is_bound = self.funcprops.is_bound_method
                 in_arg = self.arg_pos
                 args, varargs, varkw, defaults = args[:4]
                 kwonly = self.funcprops.argspec.kwonly
