Merge branch 'fix-init' of github.com:rickardraysearch/pythonnet into fix-init

rickardraysearch · rickardraysearch · commit 4fe93c4eb44e · 2017-06-21T19:16:21.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -22,6 +22,7 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
     attribute (#481)
 -   Fixed conversion of 'float' and 'double' values (#486)
 -   Fixed 'clrmethod' for python 2 (#492)
+-   Fixed double calling of constructor when deriving from .NET class (#495)
 
 
 ## [2.3.0][] - 2017-03-11
diff --git a/src/runtime/classderived.cs b/src/runtime/classderived.cs
@@ -808,7 +808,6 @@ public static void InvokeCtor(IPythonDerivedType obj, string origCtorName, objec
                 obj,
                 args);
 
-            var disposeList = new List<PyObject>();
             CLRObject self = null;
             IntPtr gs = Runtime.PyGILState_Ensure();
             try
@@ -821,22 +820,9 @@ public static void InvokeCtor(IPythonDerivedType obj, string origCtorName, objec
                 // object to be collected.
                 FieldInfo fi = obj.GetType().GetField("__pyobj__");
                 fi.SetValue(obj, self);
-
-                Runtime.XIncref(self.pyHandle);
-                var pyself = new PyObject(self.pyHandle);
-                disposeList.Add(pyself);
-
-                Runtime.XIncref(Runtime.PyNone);
-                var pynone = new PyObject(Runtime.PyNone);
-                disposeList.Add(pynone);
             }
             finally
             {
-                foreach (PyObject x in disposeList)
-                {
-                    x?.Dispose();
-                }
-
                 // Decrement the python object's reference count.
                 // This doesn't actually destroy the object, it just sets the reference to this object
                 // to be a weak reference and it will be destroyed when the C# object is destroyed.
diff --git a/src/runtime/metatype.cs b/src/runtime/metatype.cs
@@ -162,15 +162,8 @@ public static IntPtr tp_call(IntPtr tp, IntPtr args, IntPtr kw)
 
             if (init != IntPtr.Zero)
             {
-                IntPtr bound = Runtime.GetBoundArgTuple(obj, args);
-                if (bound == IntPtr.Zero)
-                {
-                    Runtime.XDecref(obj);
-                    return IntPtr.Zero;
-                }
-
-                IntPtr result = Runtime.PyObject_Call(init, bound, kw);
-                Runtime.XDecref(bound);
+                IntPtr result = Runtime.PyObject_Call(init, args, kw);
+                Runtime.XDecref(init);
 
                 if (result == IntPtr.Zero)
                 {
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -378,29 +378,6 @@ internal static void CheckExceptionOccurred()
             }
         }
 
-        internal static IntPtr GetBoundArgTuple(IntPtr obj, IntPtr args)
-        {
-            if (PyObject_TYPE(args) != PyTupleType)
-            {
-                Exceptions.SetError(Exceptions.TypeError, "tuple expected");
-                return IntPtr.Zero;
-            }
-            int size = PyTuple_Size(args);
-            IntPtr items = PyTuple_New(size + 1);
-            PyTuple_SetItem(items, 0, obj);
-            XIncref(obj);
-
-            for (var i = 0; i < size; i++)
-            {
-                IntPtr item = PyTuple_GetItem(args, i);
-                XIncref(item);
-                PyTuple_SetItem(items, i + 1, item);
-            }
-
-            return items;
-        }
-
-
         internal static IntPtr ExtendTuple(IntPtr t, params IntPtr[] args)
         {
             int size = PyTuple_Size(t);
diff --git a/src/tests/test_subclass.py b/src/tests/test_subclass.py
@@ -191,7 +191,7 @@ def test_isinstance_check():
         assert isinstance(x, System.Object)
         assert isinstance(x, System.String)
 
-def test_clr_subclass_with_init_args():
+def test_namespace_and_init():
     calls = []
     class TestX(System.Object):
         __namespace__ = "test_clr_subclass_with_init_args"
@@ -202,7 +202,7 @@ def __init__(self, *args, **kwargs):
     assert calls[0][0] == (1,2,3)
     assert calls[0][1] == {"foo":"bar"}
 
-def test_clr_subclass_without_init_args():
+def test_namespace_and_argless_init():
     calls = []
     class TestX(System.Object):
         __namespace__ = "test_clr_subclass_without_init_args"
@@ -213,9 +213,36 @@ def __init__(self):
     assert calls[0] == True
 
 
-def test_clr_subclass_without_init():
+def test_namespace_and_no_init():
     class TestX(System.Object):
         __namespace__ = "test_clr_subclass_without_init"
         q = 1
     t = TestX()
     assert t.q == 1
+
+def test_construction_from_clr():
+    import clr
+    calls = []
+    class TestX(System.Object):
+        __namespace__ = "test_clr_subclass_init_from_clr"
+        @clr.clrmethod(None, [int, str])
+        def __init__(self, i, s):
+            calls.append((i, s))
+
+    # Construct a TestX from Python
+    t = TestX(1, "foo")
+    assert len(calls) == 1
+    assert calls[0][0] == 1
+    assert calls[0][1] == "foo"
+
+    # Reset calls and construct a TestX from CLR
+    calls = []
+    tp = t.GetType()
+    t2 = tp.GetConstructors()[0].Invoke(None)
+    assert len(calls) == 0
+
+    # The object has only been constructed, now it needs to be initialized as well
+    tp.GetMethod("__init__").Invoke(t2, [1, "foo"])
+    assert len(calls) == 1
+    assert calls[0][0] == 1
+    assert calls[0][1] == "foo"
