method binding failure now supports non-Python exception causes

pythonnet · lostmsu · Jun 1, 2021 · May 5, 2020 · Feb 25, 2020 · May 5, 2020
commit e79f041f3a72e1855e8b0239ccadf954f58d9fec
diff --git a/src/runtime/methodbinder.cs b/src/runtime/methodbinder.cs
@@ -341,13 +341,13 @@ public MatchedMethod(int kwargsMatched, int defaultsNeeded, object[] margs, int
 
         private readonly struct MismatchedMethod
         {
-            public MismatchedMethod(PythonException exception, MethodBase mb)
+            public MismatchedMethod(Exception exception, MethodBase mb)
             {
                 Exception = exception;
                 Method = mb;
             }
 
-            public PythonException Exception { get; }
+            public Exception Exception { get; }
             public MethodBase Method { get; }
         }
 
@@ -438,8 +438,8 @@ internal Binding Bind(IntPtr inst, IntPtr args, IntPtr kw, MethodBase info, Meth
                     outs: out outs);
                 if (margs == null)
                 {
-                    mismatchedMethods.Add(new MismatchedMethod(PythonException.FetchCurrentRaw(), mi));
-                    Exceptions.Clear();
+                    var mismatchCause = PythonException.FetchCurrent();
+                    mismatchedMethods.Add(new MismatchedMethod(mismatchCause, mi));
                     continue;
                 }
                 if (isOperator)

diff --git a/src/runtime/pythonexception.cs b/src/runtime/pythonexception.cs
@@ -94,6 +94,10 @@ internal static PythonException FetchCurrentRaw()
             }
         }
 
+        internal static Exception FetchCurrent()
+            => FetchCurrentOrNull(out _)
+               ?? throw new InvalidOperationException("No exception is set");
+
         private static ExceptionDispatchInfo? TryGetDispatchInfo(BorrowedReference exception)
         {
             if (exception.IsNull) return null;