[stubgenc] Support nested classes

Author: sizmailov

mypy/stubgenc.py

@@ -69,7 +69,7 @@ def generate_stub_for_c_module(module_name: str,
         if name.startswith('__') and name.endswith('__'):
             continue
         if name not in done and not inspect.ismodule(obj):
-            type_str = strip_or_import(type(obj).__name__, module, imports)
+            type_str = strip_or_import(get_type_fullname(type(obj)), module, imports)
             variables.append('%s: %s' % (name, type_str))
     output = []
     for line in sorted(set(imports)):
@@ -286,6 +286,7 @@ def generate_c_type_stub(module: ModuleType,
     obj_dict = getattr(obj, '__dict__')  # type: Mapping[str, Any]  # noqa
     items = sorted(obj_dict.items(), key=lambda x: method_name_sort_key(x[0]))
     methods = []  # type: List[str]
+    types = []  # type: List[str]
     properties = []  # type: List[str]
     done = set()  # type: Set[str]
     for attr, value in items:
@@ -312,14 +313,18 @@ def generate_c_type_stub(module: ModuleType,
             done.add(attr)
             generate_c_property_stub(attr, value, properties, is_c_property_readonly(value),
                                      module=module, imports=imports)
+        elif is_c_type(value):
+            generate_c_type_stub(module, attr, value, types, imports=imports, sigs=sigs,
+                                 class_sigs=class_sigs)
+            done.add(attr)
 
     variables = []
     for attr, value in items:
         if is_skipped_attribute(attr):
             continue
         if attr not in done:
             variables.append('%s: %s = ...' % (
-                attr, strip_or_import(type(value).__name__, module, imports)))
+                attr, strip_or_import(get_type_fullname(type(value)), module, imports)))
     all_bases = obj.mro()
     if all_bases[-1] is object:
         # TODO: Is this always object?
@@ -345,10 +350,15 @@ def generate_c_type_stub(module: ModuleType,
         )
     else:
         bases_str = ''
-    if not methods and not variables and not properties:
+    if not methods and not variables and not properties and not types:
         output.append('class %s%s: ...' % (class_name, bases_str))
     else:
         output.append('class %s%s:' % (class_name, bases_str))
+        for line in types:
+            if output and output[-1] and \
+                    not output[-1].startswith('class') and line.startswith('class'):
+                output.append('')
+            output.append('    ' + line)
         for variable in variables:
             output.append('    %s' % variable)
         for method in methods:
@@ -358,7 +368,7 @@ def generate_c_type_stub(module: ModuleType,
 
 
 def get_type_fullname(typ: type) -> str:
-    return '%s.%s' % (typ.__module__, typ.__name__)
+    return '%s.%s' % (typ.__module__, getattr(typ, '__qualname__', typ.__name__))
 
 
 def method_name_sort_key(name: str) -> Tuple[int, str]:

mypy/test/teststubgen.py

@@ -625,6 +625,14 @@ def add_file(self, path: str, result: List[str], header: bool) -> None:
 self_arg = ArgSig(name='self')
 
 
+class TestBaseClass:
+    pass
+
+
+class TestClass(TestBaseClass):
+    pass
+
+
 class StubgencSuite(unittest.TestCase):
     """Unit tests for stub generation from C modules using introspection.
 
@@ -668,7 +676,7 @@ class TestClassVariableCls:
         mod = ModuleType('module', '')  # any module is fine
         generate_c_type_stub(mod, 'C', TestClassVariableCls, output, imports)
         assert_equal(imports, [])
-        assert_equal(output, ['class C:', '    x: Any = ...'])
+        assert_equal(output, ['class C:', '    x: int = ...'])
 
     def test_generate_c_type_inheritance(self) -> None:
         class TestClass(KeyError):
@@ -682,12 +690,6 @@ class TestClass(KeyError):
         assert_equal(imports, [])
 
     def test_generate_c_type_inheritance_same_module(self) -> None:
-        class TestBaseClass:
-            pass
-
-        class TestClass(TestBaseClass):
-            pass
-
         output = []  # type: List[str]
         imports = []  # type: List[str]
         mod = ModuleType(TestBaseClass.__module__, '')

test-data/stubgen/pybind11_mypy_demo/basics.pyi

@@ -4,8 +4,44 @@ from typing import overload
 PI: float
 
 class Point:
-    AngleUnit: pybind11_type = ...
-    LengthUnit: pybind11_type = ...
+    class AngleUnit:
+        __entries: dict = ...
+        degree: Point.AngleUnit = ...
+        radian: Point.AngleUnit = ...
+        def __init__(self, value: int) -> None: ...
+        def __eq__(self, other: object) -> bool: ...
+        def __getstate__(self) -> int: ...
+        def __hash__(self) -> int: ...
+        def __index__(self) -> int: ...
+        def __int__(self) -> int: ...
+        def __ne__(self, other: object) -> bool: ...
+        def __setstate__(self, state: int) -> None: ...
+        @property
+        def name(self) -> Any: ...
+        @property
+        def __doc__(self) -> Any: ...
+        @property
+        def __members__(self) -> Any: ...
+
+    class LengthUnit:
+        __entries: dict = ...
+        inch: Point.LengthUnit = ...
+        mm: Point.LengthUnit = ...
+        pixel: Point.LengthUnit = ...
+        def __init__(self, value: int) -> None: ...
+        def __eq__(self, other: object) -> bool: ...
+        def __getstate__(self) -> int: ...
+        def __hash__(self) -> int: ...
+        def __index__(self) -> int: ...
+        def __int__(self) -> int: ...
+        def __ne__(self, other: object) -> bool: ...
+        def __setstate__(self, state: int) -> None: ...
+        @property
+        def name(self) -> Any: ...
+        @property
+        def __doc__(self) -> Any: ...
+        @property
+        def __members__(self) -> Any: ...
     origin: Point = ...
     @overload
     def __init__(self) -> None: ...