Code review fixes

pythonnet · BadSingleton · Feb 11, 2021 · Feb 26, 2021 · Mar 4, 2021 · Mar 5, 2021
commit 5ea9c3ca63ecbaf8a6c39142a4d0fb73b006918c
diff --git a/src/runtime/clrobject.cs b/src/runtime/clrobject.cs
@@ -106,7 +106,7 @@ protected override void OnLoad(InterDomainContext context)
 
         public override string ToString()
         {
-            retu
8000
rn $"<CLRObject wrapping {inst}>";
+            return $"<CLRObject: {inst}>";
         }
     }
 }
diff --git a/src/runtime/exceptions.cs b/src/runtime/exceptions.cs
@@ -89,7 +89,8 @@ internal static Exception ToException(IntPtr ob)
         static void ClearOffsetHelper(IntPtr ob, int offset)
         {
             var field = Marshal.ReadIntPtr(ob, offset);
-            Runtime.Py_CLEAR(ref field);
+            Runtime.XDecref(field);
+            Marshal.WriteIntPtr(ob, offset, IntPtr.Zero);
         }
 
         // As seen in exceptions.c, every derived type must also clean the base.
@@ -200,19 +201,9 @@ internal static void SetArgsAndCause(IntPtr ob)
 
             if (e.InnerException != null)
             {
-                if(e.InnerException is PythonException)
-                {
-                    // If the error is a Python exception, write the real one
-                    var pyerr =  (e.InnerException as PythonException);
-                    Runtime.XIncref(pyerr.PyValue);
-                    Runtime.PyException_SetCause(ob, pyerr.PyValue);
-                }
-                else
-                {
-                    // Note: For an AggregateException, InnerException is only the first of the InnerExceptions.
-                    IntPtr cause = CLRObject.GetInstHandle(e.InnerException);
-                    Runtime.PyException_SetCause(ob, cause);
-                }
+                // Note: For an AggregateException, InnerException is only the first of the InnerExceptions.
+                IntPtr cause = CLRObject.GetInstHandle(e.InnerException);
+                Runtime.PyException_SetCause(ob, cause);
             }
         }
 

diff --git a/tests/test_exceptions.py b/tests/test_exceptions.py
@@ -429,7 +429,8 @@ def do_test_leak():
         orig_exc = {x for x in get_all_objects() if isinstance(x, Exception)}
         func()
         exc = {x for x in get_all_objects() if isinstance(x, Exception)}
-        assert not exc - orig_exc
+        possibly_leaked = exc - orig_exc
+        assert not possibly_leaked
 
     return do_test_leak