Fix bug in __call__ implementation when calling a base class method on

tonyroberts · tonyroberts · commit 02778b82d52c · 2014-09-15T13:07:10.000+01:00
python subclass of a managed type.
diff --git a/pythonnet/src/runtime/methodbinding.cs b/pythonnet/src/runtime/methodbinding.cs
@@ -161,13 +161,17 @@ public static IntPtr tp_call(IntPtr ob, IntPtr args, IntPtr kw) {
                         {
                             string baseMethodName = "_" + baseType.type.Name + "__" + self.m.name;
                             IntPtr baseMethod = Runtime.PyObject_GetAttrString(target, baseMethodName);
-                            if (baseMethod != null)
+                            if (baseMethod != IntPtr.Zero)
                             {
                                 MethodBinding baseSelf = GetManagedObject(baseMethod) as MethodBinding;
                                 if (baseSelf != null)
                                     self = baseSelf;
+                                Runtime.Decref(baseMethod);
+                            }
+                            else
+                            {
+                                Runtime.PyErr_Clear();
                             }
-                            Runtime.Decref(baseMethod);
                         }
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -161,13 +161,17 @@ public static IntPtr tp_call(IntPtr ob, IntPtr args, IntPtr kw) {`
`161`	`161`	`{`
`162`	`162`	`string baseMethodName = "_" + baseType.type.Name + "__" + self.m.name;`
`163`	`163`	`IntPtr baseMethod = Runtime.PyObject_GetAttrString(target, baseMethodName);`
`164`		`- if (baseMethod != null)`
	`164`	`+ if (baseMethod != IntPtr.Zero)`
`165`	`165`	`{`
`166`	`166`	`MethodBinding baseSelf = GetManagedObject(baseMethod) as MethodBinding;`
`167`	`167`	`if (baseSelf != null)`
`168`	`168`	`self = baseSelf;`
	`169`	`+ Runtime.Decref(baseMethod);`
	`170`	`+ }`
	`171`	`+ else`
	`172`	`+ {`
	`173`	`+ Runtime.PyErr_Clear();`
`169`	`174`	`}`
`170`		`- Runtime.Decref(baseMethod);`
`171`	`175`	`}`
`172`	`176`	`}`
`173`	`177`	`}`