Re-enable the Incref() call on ConstructorBinding.tp_descr_get()

Barton Cline · Barton Cline · commit bd6d847db44c · 2011-01-24T09:06:48.000Z
For now, it seems, the sole reason for the Descriptor __get__ is to return AN INCREF()ed reference to the wrapped instance.
diff --git a/pythonnet/src/runtime/constructorbinding.cs b/pythonnet/src/runtime/constructorbinding.cs
@@ -80,8 +80,7 @@ public static IntPtr tp_descr_get(IntPtr op, IntPtr instance, IntPtr owner)
                     return Exceptions.RaiseTypeError("How in the world could that happen!");
                 }
             }*/
-            /* Since ExtensionType calls Runtime.PyObject_GC_UnTrack(py), don't
-            Runtime.Incref(self.pyHandle);  // Decref'd by the interpreter??? */
+            Runtime.Incref(self.pyHandle);  // Decref'd by the interpreter.
             return self.pyHandle;
         }
 
@@ -112,7 +111,7 @@ public static IntPtr mp_subscript(IntPtr op, IntPtr key) {
             }
             BoundContructor boundCtor = new BoundContructor(self.type, self.pyTypeHndl, self.ctorBinder, ci);
 
-            /* Since ExtensionType calls Runtime.PyObject_GC_UnTrack(py), don't
+            /* Since nothing's chached, do we need the increment???
             Runtime.Incref(boundCtor.pyHandle);  // Decref'd by the interpreter??? */
             return boundCtor.pyHandle;
         }
@@ -128,7 +127,7 @@ public static IntPtr tp_repr(IntPtr ob) {
                 return self.repr;
             }
             MethodBase[] methods = self.ctorBinder.GetMethods();
-            string name = self.type.Name;
+            string name = self.type.FullName;
             string doc = "";
             for (int i = 0; i < methods.Length; i++) {
                 if (doc.Length > 0)

Original file line number	Diff line number	Diff line change
`@@ -80,8 +80,7 @@ public static IntPtr tp_descr_get(IntPtr op, IntPtr instance, IntPtr owner)`
`80`	`80`	`return Exceptions.RaiseTypeError("How in the world could that happen!");`
`81`	`81`	`}`
`82`	`82`	`}*/`
`83`		`- /* Since ExtensionType calls Runtime.PyObject_GC_UnTrack(py), don't`
`84`		`- Runtime.Incref(self.pyHandle); // Decref'd by the interpreter??? */`
	`83`	`+ Runtime.Incref(self.pyHandle); // Decref'd by the interpreter.`
`85`	`84`	`return self.pyHandle;`
`86`	`85`	`}`
`87`	`86`
`@@ -112,7 +111,7 @@ public static IntPtr mp_subscript(IntPtr op, IntPtr key) {`
`112`	`111`	`}`
`113`	`112`	`BoundContructor boundCtor = new BoundContructor(self.type, self.pyTypeHndl, self.ctorBinder, ci);`
`114`	`113`
`115`		`- /* Since ExtensionType calls Runtime.PyObject_GC_UnTrack(py), don't`
	`114`	`+ /* Since nothing's chached, do we need the increment???`
`116`	`115`	`Runtime.Incref(boundCtor.pyHandle); // Decref'd by the interpreter??? */`
`117`	`116`	`return boundCtor.pyHandle;`
`118`	`117`	`}`
`@@ -128,7 +127,7 @@ public static IntPtr tp_repr(IntPtr ob) {`
`128`	`127`	`return self.repr;`
`129`	`128`	`}`
`130`	`129`	`MethodBase[] methods = self.ctorBinder.GetMethods();`
`131`		`- string name = self.type.Name;`
	`130`	`+ string name = self.type.FullName;`
`132`	`131`	`string doc = "";`
`133`	`132`	`for (int i = 0; i < methods.Length; i++) {`
`134`	`133`	`if (doc.Length > 0)`