fixed __cause__ on overload bind failure and array conversion

lostmsu · lostmsu · commit 4c76f15d334e · 2021-04-11T03:26:36.000-07:00
diff --git a/src/runtime/converter.cs b/src/runtime/converter.cs
@@ -817,9 +817,14 @@ private static bool ToPrimitive(IntPtr value, Type obType, out object result, bo
 
         private static void SetConversionError(IntPtr value, Type target)
         {
+            // PyObject_Repr might clear the error
+            Runtime.PyErr_Fetch(out var causeType, out var causeVal, out var causeTrace);
+
             IntPtr ob = Runtime.PyObject_Repr(value);
             string src = Runtime.GetManagedString(ob);
             Runtime.XDecref(ob);
+
+            Runtime.PyErr_Restore(causeType.Steal(), causeVal.Steal(), causeTrace.Steal());
             Exceptions.RaiseTypeError($"Cannot convert {src} to {target}");
         }
 
diff --git a/src/runtime/methodbinder.cs b/src/runtime/methodbinder.cs
@@ -926,7 +926,9 @@ internal virtual IntPtr Invoke(IntPtr inst, IntPtr args, IntPtr kw, MethodBase i
                 }
 
                 value.Append(": ");
+                Runtime.PyErr_Fetch(out var errType, out var errVal, out var errTrace);
                 AppendArgumentTypes(to: value, args);
+                Runtime.PyErr_Restore(errType.StealNullable(), errVal.StealNullable(), errTrace.StealNullable());
                 Exceptions.RaiseTypeError(value.ToString());
                 return IntPtr.Zero;
             }

Original file line number	Diff line number	Diff line change
`@@ -817,9 +817,14 @@ private static bool ToPrimitive(IntPtr value, Type obType, out object result, bo`
`817`	`817`
`818`	`818`	`private static void SetConversionError(IntPtr value, Type target)`
`819`	`819`	`{`
	`820`	`+ // PyObject_Repr might clear the error`
	`821`	`+ Runtime.PyErr_Fetch(out var causeType, out var causeVal, out var causeTrace);`
	`822`	`+`
`820`	`823`	`IntPtr ob = Runtime.PyObject_Repr(value);`
`821`	`824`	`string src = Runtime.GetManagedString(ob);`
`822`	`825`	`Runtime.XDecref(ob);`
	`826`	`+`
	`827`	`+ Runtime.PyErr_Restore(causeType.Steal(), causeVal.Steal(), causeTrace.Steal());`
`823`	`828`	`Exceptions.RaiseTypeError($"Cannot convert {src} to {target}");`
`824`	`829`	`}`
`825`	`830`
Original file line number	Diff line number	Diff line change
`@@ -926,7 +926,9 @@ internal virtual IntPtr Invoke(IntPtr inst, IntPtr args, IntPtr kw, MethodBase i`
`926`	`926`	`}`
`927`	`927`
`928`	`928`	`value.Append(": ");`
	`929`	`+ Runtime.PyErr_Fetch(out var errType, out var errVal, out var errTrace);`
`929`	`930`	`AppendArgumentTypes(to: value, args);`
	`931`	`+ Runtime.PyErr_Restore(errType.StealNullable(), errVal.StealNullable(), errTrace.StealNullable());`
`930`	`932`	`Exceptions.RaiseTypeError(value.ToString());`
`931`	`933`	`return IntPtr.Zero;`
`932`	`934`	`}`