[stubgenc] Recognize pybind property return types

Pybind includes function name in the property signature in docstrings

Author: sizmailov

mypy/stubdoc.py

@@ -248,14 +248,19 @@ def infer_arg_sig_from_anon_docstring(docstr: str) -> List[ArgSig]:
     return []
 
 
-def infer_ret_type_sig_from_anon_docstring(docstr: str) -> Optional[str]:
-    """Convert signature in form of "(self: TestClass, arg0) -> int" to their return type."""
-    ret = infer_sig_from_docstring("stub" + docstr.strip(), "stub")
+def infer_ret_type_sig_from_docstring(docstr: str, name: str) -> Optional[str]:
+    """Convert signature in form of "func(self: TestClass, arg0) -> int" to their return type."""
+    ret = infer_sig_from_docstring(docstr, name)
     if ret:
         return ret[0].ret_type
     return None
 
 
+def infer_ret_type_sig_from_anon_docstring(docstr: str) -> Optional[str]:
+    """Convert signature in form of "(self: TestClass, arg0) -> int" to their return type."""
+    return infer_ret_type_sig_from_docstring("stub" + docstr.strip(), "stub")
+
+
 def parse_signature(sig: str) -> Optional[Tuple[str,
                                                 List[str],
                                                 List[str]]]:

mypy/stubgenc.py

@@ -14,7 +14,8 @@
 from mypy.moduleinspect import is_c_module
 from mypy.stubdoc import (
     infer_sig_from_docstring, infer_prop_type_from_docstring, ArgSig,
-    infer_arg_sig_from_anon_docstring, infer_ret_type_sig_from_anon_docstring, FunctionSig
+    infer_arg_sig_from_anon_docstring, infer_ret_type_sig_from_anon_docstring,
+    infer_ret_type_sig_from_docstring, FunctionSig
 )
 
 # Members of the typing module to consider for importing by default.
@@ -254,6 +255,8 @@ def infer_prop_type(docstr: Optional[str]) -> Optional[str]:
         """Infer property type from docstring or docstring signature."""
         if docstr is not None:
             inferred = infer_ret_type_sig_from_anon_docstring(docstr)
+            if not inferred:
+                inferred = infer_ret_type_sig_from_docstring(docstr, name)
             if not inferred:
                 inferred = infer_prop_type_from_docstring(docstr)
             return inferred

test-data/stubgen/pybind11_mypy_demo/basics.pyi

@@ -1,5 +1,3 @@
-from typing import Any
-
 from typing import overload
 PI: float
 
@@ -17,11 +15,11 @@ class Point:
         def __ne__(self, other: object) -> bool: ...
         def __setstate__(self, state: int) -> None: ...
         @property
-        def name(self) -> Any: ...
+        def name(self) -> str: ...
         @property
-        def __doc__(self) -> Any: ...
+        def __doc__(self) -> str: ...
         @property
-        def __members__(self) -> Any: ...
+        def __members__(self) -> dict: ...
 
     class LengthUnit:
         __entries: dict = ...
@@ -37,11 +35,11 @@ class Point:
         def __ne__(self, other: object) -> bool: ...
         def __setstate__(self, state: int) -> None: ...
         @property
-        def name(self) -> Any: ...
+        def name(self) -> str: ...
         @property
-        def __doc__(self) -> Any: ...
+        def __doc__(self) -> str: ...
         @property
-        def __members__(self) -> Any: ...
+        def __members__(self) -> dict: ...
     origin: Point = ...
     @overload
     def __init__(self) -> None: ...