fixed PY-9263 Move attribute to init method: add super class call when moving to not yet existing init

python/src/com/jetbrains/python/inspections/quickfix/AddFieldQuickFix.java

@@ -19,6 +19,8 @@ import com.jetbrains.python.psi.types.PyClassType;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import static com.jetbrains.python.PyNames.FAKE_OLD_BASE;
+
 /**
  * Available on self.my_something when my_something is unresolved.
  * User: dcheryasov
@@ -142,28 +144,40 @@ public class AddFieldQuickFix implements LocalQuickFix {
     String paramList = ancestorInit != null ? ancestorInit.getParameterList().getText() : "(self)";
 
     String functionText = "def " + PyNames.INIT + paramList + ":\n";
-    if (cls.isNewStyleClass() && ancestorInit != null &&
-        ancestorInit.getContainingClass() != PyBuiltinCache.getInstance(ancestorInit).getClass("object")) {
-      // form the super() call
-      StringBuffer sb = new StringBuffer("super(");
-      sb.append(cls.getName());
-      PyParameter[] params = ancestorInit.getParameterList().getParameters();
-      // NOTE: assume that we have at least the first param
-      String self_name = params[0].getName();
-      sb.append(", ").append(self_name).append(").").append(PyNames.INIT).append("(");
-      boolean seen = false;
-      for (int i = 1; i < params.length; i += 1) {
-        if (seen) sb.append(", ");
-        else seen = true;
-        sb.append(params[i].getText());
-      }
-      sb.append(")");
-      functionText += "    " + sb.toString();
-    }
+    if (ancestorInit == null) functionText += "    pass";
     else {
-      functionText += "    pass";
-    }
+      final PyClass ancestorClass = ancestorInit.getContainingClass();
+      if (ancestorClass != null && ancestorClass != PyBuiltinCache.getInstance(ancestorInit).getClass("object") && !FAKE_OLD_BASE.equals(ancestorClass.getName())) {
+        StringBuilder sb = new StringBuilder();
+        PyParameter[] params = ancestorInit.getParameterList().getParameters();
 
+        boolean seen = false;
+        if (cls.isNewStyleClass()) {
+          // form the super() call
+          sb.append("super(");
+          sb.append(cls.getName());
+
+          // NOTE: assume that we have at least the first param
+          String self_name = params[0].getName();
+          sb.append(", ").append(self_name).append(").").append(PyNames.INIT).append("(");
+        }
+        else {
+          sb.append(ancestorClass.getName());
+          sb.append(".__init__(self");
+          seen = true;
+        }
+        for (int i = 1; i < params.length; i += 1) {
+          if (seen) sb.append(", ");
+          else seen = true;
+          sb.append(params[i].getText());
+        }
+        sb.append(")");
+        functionText += "    " + sb.toString();
+      }
+      else {
+        functionText += "    pass";
+      }
+    }
     return PyElementGenerator.getInstance(project).createFromText(
       LanguageLevel.getDefault(), PyFunction.class, functionText,
       new int[]{0}

python/testData/quickFixes/AddFieldQuickFixTest/addFieldAddConstructor_after.py

@@ -5,6 +5,7 @@ class A:
 
 class B(A):
     def __init__(self, a, b):
+        A.__init__(self, a, b)
         self.x = None
 
     def foo(self):

python/testData/quickFixes/PyMoveAttributeToInitQuickFixTest/addSuperCallOldStyle.py

@@ -0,0 +1,9 @@
+__author__ = 'ktisha'
+
+class Base:
+    def __init__(self):
+        self.param = 2
+
+class Child(Base):
+    def f(self):
+        self.<caret>my = 2

python/testData/quickFixes/PyMoveAttributeToInitQuickFixTest/addSuperCallOldStyle_after.py

@@ -0,0 +1,13 @@
+__author__ = 'ktisha'
+
+class Base:
+    def __init__(self):
+        self.param = 2
+
+class Child(Base):
+    def __init__(self):
+        Base.__init__(self)
+        self.my = 2
+
+    def f(self):
+        pass

python/testSrc/com/jetbrains/python/quickFixes/PyMoveAttributeToInitQuickFixTest.java

@@ -34,4 +34,8 @@ public class PyMoveAttributeToInitQuickFixTest extends PyQuickFixTestCase {
     doInspectionTest(PyAttributeOutsideInitInspection.class, PyBundle.message("QFIX.move.attribute"));
   }
 
+  public void testAddSuperCallOldStyle() {
+    doInspectionTest(PyAttributeOutsideInitInspection.class, PyBundle.message("QFIX.move.attribute"));
+  }
+
 }