merge fixes

Author: chadrik

mypy/stubgen.py

@@ -423,7 +423,6 @@ def __init__(
         self.analyzed = analyzed
         # Short names of methods defined in the body of the current class
         self.method_names: set[str] = set()
-        self.current_class: str | None = None
 
     def visit_mypy_file(self, o: MypyFile) -> None:
         self.module_name = o.fullname  # Current module being processed
@@ -565,12 +564,12 @@ def visit_func_def(self, o: FuncDef) -> None:
                 if init_code:
                     self.add(init_code)
 
-        if self.current_class is not None:
+        if self._current_class is not None:
             if len(o.arguments):
                 self_var = o.arguments[0].variable.name
             else:
                 self_var = "self"
-            class_info = ClassInfo(self.current_class, self_var)
+            class_info = ClassInfo(self._current_class.name, self_var)
         else:
             class_info = None
 
@@ -703,7 +702,6 @@ def visit_class_def(self, o: ClassDef) -> None:
             self._state = EMPTY_CLASS
         else:
             self._state = CLASS
-        self.current_class = None
         self.method_names = set()
         self._current_class = None