Move __init__ calling to ClassDerived.tp_init

rickardraysearch · rickardraysearch · commit a06fc321bcf4 · 2017-06-18T22:57:53.000+02:00
diff --git a/src/embed_tests/TestRuntime.cs b/src/embed_tests/TestRuntime.cs
@@ -1,6 +1,7 @@
 ﻿using System;
 using NUnit.Framework;
 using Python.Runtime;
+using System.Linq;
 
 namespace Python.EmbeddingTest
 {
@@ -88,5 +89,35 @@ public static void PyCheck_Iter_PyObject_IsIterable_ThreadingLock_Test()
 
             Runtime.Runtime.Py_Finalize();
         }
+
+        [Test]
+        public static void PyInit_Called_once() {
+			PythonEngine.Initialize();
+
+			var locals = new PyDict();
+
+
+				PythonEngine.Exec(@"
+import System
+calls = []
+
+class X(System.Object):
+    __namespace__ = ""PyTest""
+
+    def __init__(self, calls, *args):
+        print(args)
+        calls.append(args)
+
+x = X(calls, 1, 2)
+print(calls)
+", null, locals.Handle);
+            var calls = locals.GetItem("calls");
+            Assert.AreEqual(1, calls.Length());
+            Assert.AreEqual(2, calls[0].Length());
+			Assert.AreEqual(1, calls[0][0].As<int>());
+            Assert.AreEqual(2, calls[0][1].As<int>());
+            PythonEngine.Shutdown();
+
+		}
     }
 }
diff --git a/src/runtime/classderived.cs b/src/runtime/classderived.cs
@@ -55,6 +55,50 @@ internal ClassDerivedObject(Type tp) : base(tp)
             return Converter.ToPython(obj, cls.GetType());
         }
 
+        /// <summary>
+        /// Implements __init__ for derived classes of reflected classes.
+        /// </summary>
+        public new static int tp_init(IntPtr ob, IntPtr args, IntPtr kw)
+        {
+            var disposeList = new List<PyObject>();
+            try
+            {
+                var self = (CLRObject)GetManagedObject(ob);
+
+                // call __init__
+                using (var pyself = new PyObject(self.pyHandle))
+                using (var pynone = new PyObject(Runtime.PyNone))
+                {
+                    PyObject init = pyself.GetAttr("__init__", pynone);
+                    int pynargs = Runtime.PyTuple_Size(args);
+                    if (init.Handle != Runtime.PyNone)
+                    {
+                        // if __init__ hasn't been overridden then it will be a managed object
+                        ManagedType managedMethod = ManagedType.GetManagedObject(init.Handle);
+                        if (null == managedMethod)
+                        {
+                            var pyargs = new PyObject[pynargs];
+                            for (var i = 0; i < pynargs; ++i)
+                            {
+                                pyargs[i] = new PyObject(Runtime.PyTuple_GetItem(args, i));
+                            }
+
+                            disposeList.Add(init.Invoke(pyargs));
+                        }
+                    }
+                }
+
+                return 0;
+            }
+            finally
+            {
+                foreach (PyObject x in disposeList)
+                {
+                    x?.Dispose();
+                }
+            }
+        }
+
         public new static void tp_dealloc(IntPtr ob)
         {
             var self = (CLRObject)GetManagedObject(ob);
@@ -829,26 +873,6 @@ public static void InvokeCtor(IPythonDerivedType obj, string origCtorName, objec
                 Runtime.XIncref(Runtime.PyNone);
                 var pynone = new PyObject(Runtime.PyNone);
                 disposeList.Add(pynone);
-
-                // call __init__
-                PyObject init = pyself.GetAttr("__init__", pynone);
-                disposeList.Add(init);
-                if (init.Handle != Runtime.PyNone)
-                {
-                    // if __init__ hasn't been overridden then it will be a managed object
-                    ManagedType managedMethod = ManagedType.GetManagedObject(init.Handle);
-                    if (null == managedMethod)
-                    {
-                        var pyargs = new PyObject[args.Length];
-                        for (var i = 0; i < args.Length; ++i)
-                        {
-                            pyargs[i] = new PyObject(Converter.ToPython(args[i], args[i]?.GetType()));
-                            disposeList.Add(pyargs[i]);
-                        }
-
-                        disposeList.Add(init.Invoke(pyargs));
-                    }
-                }
             }
             finally
             {
