sdpython
diff --git a/‎src/runtime/clrobject.cs‎
Lines changed: 3 additions & 0 deletions b/‎src/runtime/clrobject.cs‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎src/runtime/converter.cs‎
Lines changed: 1 addition & 44 deletions b/‎src/runtime/converter.cs‎
Lines changed: 1 addition & 44 deletions
@@ -30,6 +30,9 @@ internal CLRObject(Object ob, IntPtr tp) : base()
             this.pyHandle = py;
             this.gcHandle = gc;
             inst = ob;
+
+            // Fix the BaseException args slot if wrapping a CLR exception
+            Exceptions.SetArgs(py);
         }
 
 
 
@@ -156,20 +156,7 @@ internal static IntPtr ToPython(Object value, Type type)
             switch (tc)
             {
                 case TypeCode.Object:
-                    result = CLRObject.GetInstHandle(value, type);
-
-                    // XXX - hack to make sure we convert new-style class based
-                    // managed exception instances to wrappers ;(
-                    if (Runtime.wrap_exceptions)
-                    {
-                        Exception e = value as Exception;
-                        if (e != null)
-                        {
-                            return Exceptions.GetExceptionInstanceWrapper(result);
-                        }
-                    }
-
-                    return result;
+                    return CLRObject.GetInstHandle(value, type);
 
                 case TypeCode.String:
                     return Runtime.PyUnicode_FromString((string)value);
@@ -283,36 +270,6 @@ internal static bool ToManagedValue(IntPtr value, Type obType,
             ManagedType mt = ManagedType.GetManagedObject(value);
             result = null;
 
-            // XXX - hack to support objects wrapped in old-style classes
-            // (such as exception objects).
-            if (Runtime.wrap_exceptions)
-            {
-                if (mt == null)
-                {
-                    if (Runtime.PyObject_IsInstance(
-                        value, Exceptions.Exception
-                        ) > 0)
-                    {
-                        IntPtr p = Runtime.PyObject_GetAttrString(value, "_inner");
-                        if (p != IntPtr.Zero)
-                        {
-                            // This is safe because we know that the __dict__ of
-                            // value holds a reference to _inner.
-                            value = p;
-                            Runtime.XDecref(p);
-                            mt = ManagedType.GetManagedObject(value);
-                        }
-                    }
-                    IntPtr c = Exceptions.UnwrapExceptionClass(value);
-                    if ((c != IntPtr.Zero) && (c != value))
-                    {
-                        value = c;
-                        Runtime.XDecref(c);
-                        mt = ManagedType.GetManagedObject(value);
-                    }
-                }
-            }
-
             if (mt != null)
             {
                 if (mt is CLRObject)
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,9 @@ internal CLRObject(Object ob, IntPtr tp) : base()`
`30`	`30`	`this.pyHandle = py;`
`31`	`31`	`this.gcHandle = gc;`
`32`	`32`	`inst = ob;`
	`33`	`+`
	`34`	`+ // Fix the BaseException args slot if wrapping a CLR exception`
	`35`	`+ Exceptions.SetArgs(py);`
`33`	`36`	`}`
`34`	`37`
`35`	`38`