Handle type annotations in function signatures

sebastinas · sebastinas · commit c6e513c91a07 · 2022-08-26T23:52:46.000+02:00
diff --git a/bpython/inspection.py b/bpython/inspection.py
@@ -26,7 +26,7 @@
 import pydoc
 import re
 from collections import namedtuple
-from typing import Any, Optional, Type
+from typing import Any, Optional, Type, Dict, List
 from types import MemberDescriptorType, TracebackType
 from ._typing_compat import Literal
 
@@ -121,15 +121,16 @@ def __repr__(self):
     __str__ = __repr__
 
 
-def parsekeywordpairs(signature):
-    tokens = Python3Lexer().get_tokens(signature)
+def parsekeywordpairs(signature: str) -> Dict[str, str]:
     preamble = True
     stack = []
-    substack = []
+    substack: List[str] = []
     parendepth = 0
-    for token, value in tokens:
+    annotation = False
+    for token, value in Python3Lexer().get_tokens(signature):
         if preamble:
             if token is Token.Punctuation and value == "(":
+                # First "(" starts the list of arguments
                 preamble = False
             continue
 
@@ -141,14 +142,23 @@ def parsekeywordpairs(signature):
             elif value == ":" and parendepth == -1:
                 # End of signature reached
                 break
+            elif value == ":" and parendepth == 0:
+                # Start of type annotation
+                annotation = True
+
             if (value == "," and parendepth == 0) or (
                 value == ")" and parendepth == -1
             ):
                 stack.append(substack)
                 substack = []
+                # If type annotation didn't end before, ti does now.
+                annotation = False
                 continue
+        elif token is Token.Operator and value == "=" and parendepth == 0:
+            # End of type annotation
+            annotation = False
 
-        if value and (parendepth > 0 or value.strip()):
+        if value and not annotation and (parendepth > 0 or value.strip()):
             substack.append(value)
 
     return {item[0]: "".join(item[2:]) for item in stack if len(item) >= 3}
diff --git a/bpython/test/test_inspection.py b/bpython/test/test_inspection.py
@@ -147,7 +147,6 @@ def test_getfuncprops_numpy_array(self):
         # np.array(object, dtype=None, *, ...).
         self.assertEqual(props.argspec.args, ["object", "dtype"])
 
-    @unittest.expectedFailure
     def test_issue_966_freestanding(self):
         def fun(number, lst=[]):
             """
