Also handle function __doc__ where the signature is split over two or more lines

sebastinas · sebastinas · commit 72e1c4b4bbb7 · 2021-03-16T23:17:32.000+01:00
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -26,7 +26,8 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install -r requirements.txt
-        pip install pytest pytest-cov urwid twisted watchdog "jedi >=0.16" babel "sphinx >=1.5"
+        pip install urwid twisted watchdog "jedi >=0.16" babel "sphinx >=1.5"
+        pip install pytest pytest-cov numpy
     - name: Build with Python ${{ matrix.python-version }}
       run: |
         python setup.py build
diff --git a/bpython/inspection.py b/bpython/inspection.py
@@ -24,6 +24,7 @@
 import inspect
 import keyword
 import pydoc
+import re
 from collections import namedtuple
 
 from pygments.token import Token
@@ -173,7 +174,9 @@ def fixlongargs(f, argspec):
     argspec[3] = values
 
 
-getpydocspec_re = LazyReCompile(r"([a-zA-Z_][a-zA-Z0-9_]*?)\((.*?)\)")
+getpydocspec_re = LazyReCompile(
+    r"([a-zA-Z_][a-zA-Z0-9_]*?)\((.*?)\)", re.DOTALL
+)
 
 
 def getpydocspec(f, func):
@@ -189,10 +192,10 @@ def getpydocspec(f, func):
     if not hasattr_safe(f, "__name__") or s.groups()[0] != f.__name__:
         return None
 
-    args = list()
-    defaults = list()
+    args = []
+    defaults = []
     varargs = varkwargs = None
-    kwonly_args = list()
+    kwonly_args = []
     kwonly_defaults = dict()
     for arg in s.group(2).split(","):
         arg = arg.strip()
diff --git a/bpython/test/test_inspection.py b/bpython/test/test_inspection.py
@@ -6,6 +6,11 @@
 from bpython.test.fodder import encoding_latin1
 from bpython.test.fodder import encoding_utf8
 
+try:
+    import numpy
+except ImportError:
+    numpy = None
+
 
 foo_ascii_only = '''def foo():
     """Test"""
@@ -113,6 +118,15 @@ def test_get_source_file(self):
         )
         self.assertEqual(encoding, "utf-8")
 
+    @unittest.skipUnless(numpy is not None, "requires numpy")
+    def test_getfuncprops_numpy_array(self):
+        props = inspection.getfuncprops("array", numpy.array)
+
+        self.assertEqual(props.func, "array")
+        # This check might need an update in the future, but at least numpy >= 1.18 has
+        # np.array(object, dtype=None, *, ...).
+        self.assertEqual(props.argspec.args, ["object", "dtype"])
+
 
 class A:
     a = "a"
