turned on CLR exception marshaling

pythonnet · lostmsu · Jun 1, 2021 · May 5, 2020 · Feb 25, 2020 · May 5, 2020
commit 0d941c576bc676c718bac189d228aa261018c307
diff --git a/src/runtime/delegatemanager.cs b/src/runtime/delegatemanager.cs
@@ -257,8 +257,7 @@ public object TrueDispatch(ArrayList args)
 
             if (op == IntPtr.Zero)
             {
-                var e = new PythonException();
-                throw e;
+                throw PythonException.ThrowLastAsClrException();
             }
 
             if (rtype == typeof(void))

diff --git a/src/runtime/exceptions.cs b/src/runtime/exceptions.cs
@@ -197,7 +197,7 @@ internal static void ErrorCheck(IntPtr pointer)
         {
             if (pointer == IntPtr.Zero)
             {
-                throw new PythonException();
+                throw PythonException.ThrowLastAsClrException();
             }
         }
 
@@ -208,7 +208,7 @@ internal static void ErrorOccurredCheck(IntPtr pointer)
         {
             if (pointer == IntPtr.Zero || ErrorOccurred())
             {
-                throw new PythonException();
+                throw PythonException.ThrowLastAsClrException();
             }
         }
 

diff --git a/src/runtime/pydict.cs b/src/runtime/pydict.cs
@@ -34,7 +34,7 @@ public PyDict()
             obj = Runtime.PyDict_New();
             if (obj == IntPtr.Zero)
             {
-                throw new PythonException();
+                throw PythonException.ThrowLastAsClrException();
             }
         }
 
@@ -108,7 +108,7 @@ public PyObject Keys()
             IntPtr items = Runtime.PyDict_Keys(obj);
             if (items == IntPtr.Zero)
             {
-                throw new PythonException();
+                throw PythonException.ThrowLastAsClrException();
             }
             return new PyObject(items);
         }
@@ -125,7 +125,7 @@ public PyObject Values()
             IntPtr items = Runtime.PyDict_Values(obj);
             if (items == IntPtr.Zero)
             {
-                throw new PythonException();
+                throw PythonException.ThrowLastAsClrException();
             }
             return new PyObject(items);
         }
@@ -144,7 +144,7 @@ public PyObject Items()
             {
                 if (items.IsNull())
                 {
-                    throw new PythonException();
+                    throw PythonException.ThrowLastAsClrException();
                 }
 
                 return items.MoveToPyObject();
@@ -167,7 +167,7 @@ public PyDict Copy()
             IntPtr op = Runtime.PyDict_Copy(obj);
             if (op == IntPtr.Zero)
             {
-                throw new PythonException();
+                throw PythonException.ThrowLastAsClrException();
             }
             return new PyDict(op);
         }
@@ -184,7 +184,7 @@ public void Update(PyObject other)
             int result = Runtime.PyDict_Update(obj, other.obj);
             if (result < 0)
             {
-                throw new PythonException();
+                throw PythonException.ThrowLastAsClrException();
             }
         }
 

diff --git a/src/runtime/pyiter.cs b/src/runtime/pyiter.cs
@@ -36,7 +36,7 @@ public PyIter(PyObject iterable)
             obj = Runtime.PyObject_GetIter(iterable.obj);
             if (obj == IntPtr.Zero)
             {
-                throw new PythonException();
+                throw PythonException.ThrowLastAsClrException();
             }
         }
 

diff --git a/src/runtime/pylist.cs b/src/runtime/pylist.cs
@@ -53,7 +53,7 @@ public PyList()
             obj = Runtime.PyList_New(0);
             if (obj == IntPtr.Zero)
             {
-                throw new PythonException();
+                throw PythonException.ThrowLastAsClrException();
             }
         }
 
@@ -75,7 +75,7 @@ public PyList(PyObject[] items)
                 int r = Runtime.PyList_SetItem(obj, i, ptr);
                 if (r < 0)
                 {
-                    throw new PythonException();
+                    throw PythonException.ThrowLastAsClrException();
                 }
             }
         }
@@ -106,7 +106,7 @@ public static PyList AsList(PyObject value)
             IntPtr op = Runtime.PySequence_List(value.obj);
             if (op == IntPtr.Zero)
             {
-                throw new PythonException();
+                throw PythonException.ThrowLastAsClrException();
             }
             return new PyList(op);
         }
@@ -123,7 +123,7 @@ public void Append(PyObject item)
             int r = Runtime.PyList_Append(this.Reference, item.obj);
             if (r < 0)
             {
-                throw new PythonException();
+                throw PythonException.ThrowLastAsClrException();
             }
         }
 
@@ -138,7 +138,7 @@ public void Insert(int index, PyObject item)
             int r = Runtime.PyList_Insert(this.Reference, index, item.obj);
             if (r < 0)
             {
-                throw new PythonException();
+                throw PythonException.ThrowLastAsClrException();
             }
         }
 
@@ -154,7 +154,7 @@ public void Reverse()
             int r = Runtime.PyList_Reverse(this.Reference);
             if (r < 0)
             {
-                throw new PythonException();
+                throw PythonException.ThrowLastAsClrException();
             }
         }
 
@@ -170,7 +170,7 @@ public void Sort()
             int r = Runtime.PyList_Sort(this.Reference);
             if (r < 0)
             {
-                throw new PythonException();
+                throw PythonException.ThrowLastAsClrException();
             }
         }
     }

diff --git a/src/runtime/pyobject.cs b/src/runtime/pyobject.cs
@@ -311,7 +311,7 @@ public PyObject GetAttr(string name)
             IntPtr op = Runtime.PyObject_GetAttrString(obj, name);
             if (op == IntPtr.Zero)
             {
-                throw new PythonException();
+                throw PythonException.ThrowLastAsClrException();
             }
             return new PyObject(op);
         }
@@ -353,7 +353,7 @@ public PyObject GetAttr(PyObject name)
             IntPtr op = Runtime.PyObject_GetAttr(obj, name.obj);
             if (op == IntPtr.Zero)
             {
-                throw new PythonException();
+                throw PythonException.ThrowLastAsClrException();
             }
             return new PyObject(op);
         }
@@ -396,7 +396,7 @@ public void SetAttr(string name, PyObject value)
             int r = Runtime.PyObject_SetAttrString(obj, name, value.obj);
             if (r < 0)
             {
-                throw new PythonException();
+                throw PythonException.ThrowLastAsClrException();
             }
         }
 
@@ -417,7 +417,7 @@ public void SetAttr(PyObject name, PyObject value)
             int r = Runtime.PyObject_SetAttr(obj, name.obj, value.obj);
             if (r < 0)
             {
-                throw new PythonException();
+                throw PythonException.ThrowLastAsClrException();
             }
         }
 
@@ -436,7 +436,7 @@ public void DelAttr(string name)
             int r = Runtime.PyObject_SetAttrString(obj, name, IntPtr.Zero);
             if (r < 0)
             {
-                throw new PythonException();
+                throw PythonException.ThrowLastAsClrException();
             }
         }
 
@@ -456,7 +456,7 @@ public void DelAttr(PyObject name)
             int r = Runtime.PyObject_SetAttr(obj, name.obj, IntPtr.Zero);
             if (r < 0)
             {
-                throw new PythonException();
+                throw PythonException.ThrowLastAsClrException();
             }
         }
 
@@ -476,7 +476,7 @@ public virtual PyObject GetItem(PyObject key)
             IntPtr op = Runtime.PyObject_GetItem(obj, key.obj);
             if (op == IntPtr.Zero)
             {
-                throw new PythonException();
+                throw PythonException.ThrowLastAsClrException();
             }
             return new PyObject(op);
         }
@@ -534,7 +534,7 @@ public virtual void SetItem(PyObject key, PyObject value)
             int r = Runtime.PyObject_SetItem(obj, key.obj, value.obj);
             if (r < 0)
             {
-                throw new PythonException();
+                throw PythonException.ThrowLastAsClrException();
             }
         }
 
@@ -593,7 +593,7 @@ public virtual void DelItem(PyObject key)
             int r = Runtime.PyObject_DelItem(obj, key.obj);
             if (r < 0)
             {
-                throw new PythonException();
+                throw PythonException.ThrowLastAsClrException();
             }
         }
 
@@ -708,7 +708,7 @@ public PyObject GetIterator()
             IntPtr r = Runtime.PyObject_GetIter(obj);
             if (r == IntPtr.Zero)
             {
-                throw new PythonException();
+                throw PythonException.ThrowLastAsClrException();
             }
             return new PyObject(r);
         }
@@ -744,7 +744,7 @@ public PyObject Invoke(params PyObject[] args)
             t.Dispose();
             if (r == IntPtr.Zero)
             {
-                throw new PythonException();
+                throw PythonException.ThrowLastAsClrException();
             }
             return new PyObject(r);
         }
@@ -764,7 +764,7 @@ public PyObject Invoke(PyTuple args)
             IntPtr r = Runtime.PyObject_Call(obj, args.obj, IntPtr.Zero);
             if (r == IntPtr.Zero)
             {
-                throw new PythonException();
+                throw PythonException.ThrowLastAsClrException();
             }
             return new PyObject(r);
         }
@@ -787,7 +787,7 @@ public PyObject Invoke(PyObject[] args, PyDict kw)
             t.Dispose();
             if (r == IntPtr.Zero)
             {
-                throw new PythonException();
+                throw PythonException.ThrowLastAsClrException();
             }
             return new PyObject(r);
         }
@@ -807,7 +807,7 @@ public PyObject Invoke(PyTuple args, PyDict kw)
             IntPtr r = Runtime.PyObject_Call(obj, args.obj, kw?.obj ?? IntPtr.Zero);
             if (r == IntPtr.Zero)
             {
-                throw new PythonException();
+                throw PythonException.ThrowLastAsClrException();
             }
             return new PyObject(r);
         }
@@ -1028,7 +1028,7 @@ public PyList Dir()
             IntPtr r = Runtime.PyObject_Dir(obj);
             if (r == IntPtr.Zero)
             {
-                throw new PythonException();
+                throw PythonException.ThrowLastAsClrException();
             }
             return new PyList(r);
         }
@@ -1086,7 +1086,7 @@ public override bool Equals(object o)
             int r = Runtime.PyObject_Compare(obj, ((PyObject)o).obj);
             if (Exceptions.ErrorOccurred())
             {
-                throw new PythonException();
+                throw PythonException.ThrowLastAsClrException();
             }
             return r == 0;
         }
@@ -1127,7 +1127,7 @@ public override bool TrySetMember(SetMemberBinder binder, object value)
             int r = Runtime.PyObject_SetAttrString(obj, binder.Name, ptr);
             if (r < 0)
             {
-                throw new PythonException();
+                throw PythonException.ThrowLastAsClrException();
             }
             Runtime.XDecref(ptr);
             return true;
@@ -1199,7 +1199,7 @@ private static void AddArgument(IntPtr argtuple, int i, object target)
 
             if (Runtime.PyTuple_SetItem(argtuple, i, ptr) < 0)
             {
-                throw new PythonException();
+                throw PythonException.ThrowLastAsClrException();
             }
         }
 

diff --git a/src/runtime/pyscope.cs b/src/runtime/pyscope.cs
@@ -186,7 +186,7 @@ public void ImportAll(PyScope scope)
             int result = Runtime.PyDict_Update(variables, scope.variables);
             if (result < 0)
             {
-                throw new PythonException();
+                throw PythonException.ThrowLastAsClrException();
             }
         }
 
@@ -206,7 +206,7 @@ public void ImportAll(PyObject module)
             int result = Runtime.PyDict_Update(variables, module_dict);
             if (result < 0)
             {
-                throw new PythonException();
+                throw PythonException.ThrowLastAsClrException();
             }
         }
 
@@ -221,7 +221,7 @@ public void ImportAll(PyDict dict)
             int result = Runtime.PyDict_Update(variables, dict.obj);
             if (result < 0)
             {
-                throw new PythonException();
+                throw PythonException.ThrowLastAsClrException();
             }
         }
 
@@ -333,7 +333,7 @@ private void Exec(string code, IntPtr _globals, IntPtr _locals)
                 Runtime.CheckExceptionOccurred();
                 if (!reference.IsNone())
                 {
-                    throw new PythonException();
+                    throw PythonException.ThrowLastAsClrException();
                 }
             }
             finally
@@ -364,7 +364,7 @@ private void Set(string name, IntPtr value)
                 int r = Runtime.PyObject_SetItem(variables, pyKey.obj, value);
                 if (r < 0)
                 {
-                    throw new PythonException();
+                    throw PythonException.ThrowLastAsClrException();
                 }
             }
         }
@@ -383,7 +383,7 @@ public void Remove(string name)
                 int r = Runtime.PyObject_DelItem(variables, pyKey.obj);
                 if (r < 0)
                 {
-                    throw new PythonException();
+                    throw PythonException.ThrowLastAsClrException();
                 }
             }
         }
@@ -438,7 +438,7 @@ public bool TryGet(string name, out PyObject value)
                     IntPtr op = Runtime.PyObject_GetItem(variables, pyKey.obj);
                     if (op == IntPtr.Zero)
                     {
-                        throw new PythonException();
+                        throw PythonException.ThrowLastAsClrException();
                     }
                     if (op == Runtime.PyNone)
                     {
@@ -577,7 +577,7 @@ internal PyScope NewScope(string name)
             var module = Runtime.PyModule_New(name);
             if (module == IntPtr.Zero)
             {
-                throw new PythonException();
+                throw PythonException.ThrowLastAsClrException();
             }
             return new PyScope(module, this);
         }