Keep calling base managed constructor

Author: Martin-Molinero

src/embed_tests/QCTest.cs

@@ -1,21 +1,28 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using NUnit.Framework;
 using Python.Runtime;
 
 namespace Python.EmbeddingTest
 {
     class QCTests
     {
+        private static dynamic pythonSuperInitInt;
+        private static dynamic pythonSuperInitDefault;
+        private static dynamic pythonSuperInitNone;
+        private static dynamic pythonSuperInitNotCallingBase;
+
+        private static dynamic withArgs_PythonSuperInitNotCallingBase;
+        private static dynamic withArgs_PythonSuperInitDefault;
+        private static dynamic withArgs_PythonSuperInitInt;
+
         private static dynamic containsTest;
         private static dynamic module;
         private static string testModule = @"
 from clr import AddReference
 AddReference(""System"")
 AddReference(""Python.EmbeddingTest"")
-from Python.EmbeddingTest import Algo, Insight
+from Python.EmbeddingTest import *
 class PythonModule(Algo):
     def TestA(self):
         try:
@@ -28,6 +35,34 @@ def ContainsTest(key, collection):
     if key in collection.Keys:
         return True
     return False
+
+class WithArgs_PythonSuperInitNotCallingBase(SuperInit):
+    def __init__(self, jose):
+        return
+
+class WithArgs_PythonSuperInitDefault(SuperInit):
+    def __init__(self, jose):
+        super().__init__()
+
+class WithArgs_PythonSuperInitInt(SuperInit):
+    def __init__(self, jose):
+        super().__init__(jose)
+
+class PythonSuperInitNotCallingBase(SuperInit):
+    def __init__(self):
+        return
+
+class PythonSuperInitDefault(SuperInit):
+    def __init__(self):
+        super().__init__()
+
+class PythonSuperInitInt(SuperInit):
+    def __init__(self):
+        super().__init__(1)
+
+class PythonSuperInitNone(SuperInit):
+    def jose(self):
+        return 1
 ";
 
         [OneTimeSetUp]
@@ -37,6 +72,15 @@ public void Setup()
             var pyModule = PyModule.FromString("module", testModule);
             containsTest = pyModule.GetAttr("ContainsTest");
             module = pyModule.GetAttr("PythonModule").Invoke();
+
+            pythonSuperInitInt = pyModule.GetAttr("PythonSuperInitInt");
+            pythonSuperInitDefault = pyModule.GetAttr("PythonSuperInitDefault");
+            pythonSuperInitNone = pyModule.GetAttr("PythonSuperInitNone");
+            pythonSuperInitNotCallingBase = pyModule.GetAttr("PythonSuperInitNotCallingBase");
+
+            withArgs_PythonSuperInitNotCallingBase = pyModule.GetAttr("WithArgs_PythonSuperInitNotCallingBase");
+            withArgs_PythonSuperInitDefault = pyModule.GetAttr("WithArgs_PythonSuperInitDefault");
+            withArgs_PythonSuperInitInt = pyModule.GetAttr("WithArgs_PythonSuperInitInt");
         }
 
         [OneTimeTearDown]
@@ -62,6 +106,87 @@ public void ContainsTest(string key, bool expected)
             var dic = new Dictionary<string, object> { { "SPY", new object() } };
             Assert.AreEqual(expected, (bool)containsTest(key, dic));
         }
+
+        [Test]
+        public void WithArgs_NoBaseConstructorCall()
+        {
+            using (Py.GIL())
+            {
+                var instance = withArgs_PythonSuperInitNotCallingBase(1);
+                // this is true because we call the constructor always
+                Assert.IsTrue((bool)instance.CalledInt);
+                Assert.IsFalse((bool)instance.CalledDefault);
+            }
+        }
+
+        [Test]
+        public void WithArgs_IntConstructor()
+        {
+            using (Py.GIL())
+            {
+                var instance = withArgs_PythonSuperInitInt(1);
+                Assert.IsTrue((bool)instance.CalledInt);
+                Assert.IsFalse((bool)instance.CalledDefault);
+            }
+        }
+
+        [Test]
+        public void WithArgs_DefaultConstructor()
+        {
+            using (Py.GIL())
+            {
+                var instance = withArgs_PythonSuperInitDefault(1);
+                Assert.IsTrue((bool)instance.CalledInt);
+                Assert.IsTrue((bool)instance.CalledDefault);
+            }
+        }
+
+        [Test]
+        public void NoArgs_NoBaseConstructorCall()
+        {
+            using (Py.GIL())
+            {
+                var instance = pythonSuperInitNotCallingBase();
+                Assert.IsFalse((bool)instance.CalledInt);
+                // this is true because we call the default constructor always
+                Assert.IsTrue((bool)instance.CalledDefault);
+            }
+        }
+
+        [Test]
+        public void NoArgs_IntConstructor()
+        {
+            using (Py.GIL())
+            {
+                var instance = pythonSuperInitInt();
+                Assert.IsTrue((bool)instance.CalledInt);
+                // this is true because we call the default constructor always
+                Assert.IsTrue((bool)instance.CalledDefault);
+            }
+        }
+
+        [Test]
+        public void NoArgs_DefaultConstructor()
+        {
+            using (Py.GIL())
+            {
+                var instance = pythonSuperInitNone();
+                Assert.IsFalse((bool)instance.CalledInt);
+                Assert.IsTrue((bool)instance.CalledDefault);
+            }
+        }
+
+        [Test]
+        public void NoArgs_NoConstructor()
+        {
+            using (Py.GIL())
+            {
+                var instance = pythonSuperInitDefault.Invoke();
+
+                Assert.IsFalse((bool)instance.CalledInt);
+                Assert.IsTrue((bool)instance.CalledDefault);
+            }
+        }
     }
 
     public class Algo
@@ -83,6 +208,20 @@ public void EmitInsights(params Insight[] insights)
 
     }
 
+    public class SuperInit
+    {
+        public bool CalledInt { get; private set; }
+        public bool CalledDefault { get; private set; }
+        public SuperInit(int a)
+        {
+            CalledInt = true;
+        }
+        public SuperInit()
+        {
+            CalledDefault = true;
+        }
+    }
+
     public class Insight
     {
         public string info;

src/runtime/Types/ClassObject.cs

@@ -15,12 +15,13 @@ namespace Python.Runtime
     [Serializable]
     internal class ClassObject : ClassBase
     {
+        private ConstructorInfo[] constructors;
         internal readonly int NumCtors = 0;
 
         internal ClassObject(Type tp) : base(tp)
         {
-            var _ctors = type.Value.GetConstructors();
-            NumCtors = _ctors.Length;
+            constructors = type.Value.GetConstructors();
+            NumCtors = constructors.Length;
         }
 
 
@@ -110,8 +111,40 @@ static NewReference tp_new_impl(BorrowedReference tp, BorrowedReference args, Bo
             }
 
             object obj = FormatterServices.GetUninitializedObject(type);
+            var pythonObj = self.NewObjectToPython(obj, tp);
 
-            return self.NewObjectToPython(obj, tp);
+            try
+            {
+                var binder = new MethodBinder();
+                for (int i = 0; i < self.constructors.Length; i++)
+                {
+                    binder.AddMethod(self.constructors[i]);
+                }
+
+                // let's try to generate a binding using the args/kw we have
+                var binding = binder.Bind(pythonObj.Borrow(), args, kw);
+                if (binding != null)
+                {
+                    binding.info.Invoke(obj, BindingFlags.Default, null, binding.args, null);
+                }
+                else
+                {
+                    // if we didn't match any constructor let's fall back into the default constructor, no args
+                    using var tuple = Runtime.PyTuple_New(0);
+                    binding = binder.Bind(pythonObj.Borrow(), tuple.Borrow(), null);
+                    if(binding != null)
+                    {
+                        binding.info.Invoke(obj, BindingFlags.Default, null, binding.args, null);
+                    }
+                }
+            }
+            catch (Exception)
+            {
+                Exceptions.Clear();
+                // we try our best to call the base constructor but don't let it stop us
+            }
+
+            return pythonObj;
         }
 
         protected virtual void SetTypeNewSlot(BorrowedReference pyType, SlotsHolder slotsHolder)