Nov 10, 2016 · Nov 8, 2016 · Nov 8, 2016 · Nov 8, 2016 · Nov 8, 2016 · Nov 8, 2016
diff --git a/src/runtime/clrobject.cs b/src/runtime/clrobject.cs
            this.pyHandle = py;
            this.gcHandle = gc;
            inst = ob;

            // Fix the BaseException args slot if wrapping a CLR exception
            Exceptions.SetArgs(py);
        }


diff --git a/src/runtime/converter.cs b/src/runtime/converter.cs
            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);
            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
Expand Up		@@ -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);
		}


Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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);
Expand DownExpand Up		@@ -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)
Expand Down