Implement IConvertible interface on PyObject

filmor · filmor · commit 9a0ceb698ea8 · 2022-04-10T18:27:56.000+02:00
diff --git a/src/runtime/Converter.cs b/src/runtime/Converter.cs
@@ -550,7 +550,7 @@ internal static int ToInt32(BorrowedReference value)
         /// <summary>
         /// Convert a Python value to an instance of a primitive managed type.
         /// </summary>
-        private static bool ToPrimitive(BorrowedReference value, Type obType, out object? result, bool setError)
+        internal static bool ToPrimitive(BorrowedReference value, Type obType, out object? result, bool setError)
         {
             result = null;
             if (obType.IsEnum)
diff --git a/src/runtime/PythonTypes/PyFloat.cs b/src/runtime/PythonTypes/PyFloat.cs
@@ -101,5 +101,7 @@ public static PyFloat AsFloat(PyObject value)
             PythonException.ThrowIfIsNull(op);
             return new PyFloat(op.Steal());
         }
+
+        public override TypeCode GetTypeCode() => TypeCode.Double;
     }
 }
diff --git a/src/runtime/PythonTypes/PyInt.cs b/src/runtime/PythonTypes/PyInt.cs
@@ -230,5 +230,7 @@ public string ToString(string format, IFormatProvider formatProvider)
             using var _ = Py.GIL();
             return ToBigInteger().ToString(format, formatProvider);
         }
+
+        public override TypeCode GetTypeCode() => TypeCode.Int64;
     }
 }
diff --git a/src/runtime/PythonTypes/PyObject.IConvertible.cs b/src/runtime/PythonTypes/PyObject.IConvertible.cs
@@ -0,0 +1,53 @@
+using System;
+
+namespace Python.Runtime;
+
+public partial class PyObject : IConvertible
+{
+    public virtual TypeCode GetTypeCode() => TypeCode.Object;
+
+    private T DoConvert<T>()
+    {
+        using var _ = Py.GIL();
+        if (Converter.ToPrimitive(Reference, typeof(T), out object? result, setError: false))
+        {
+            return (T)result!;
+        }
+        else
+        {
+            throw new InvalidCastException();
+        }
+    }
+
+    public bool ToBoolean(IFormatProvider provider) => DoConvert<bool>();
+    public byte ToByte(IFormatProvider provider) => DoConvert<byte>();
+    public char ToChar(IFormatProvider provider) => DoConvert<char>();
+    public short ToInt16(IFormatProvider provider) => DoConvert<short>();
+    public int ToInt32(IFormatProvider provider) => DoConvert<int>();
+    public long ToInt64(IFormatProvider provider) => DoConvert<long>();
+    public sbyte ToSByte(IFormatProvider provider) => DoConvert<sbyte>();
+    public ushort ToUInt16(IFormatProvider provider) => DoConvert<ushort>();
+    public uint ToUInt32(IFormatProvider provider) => DoConvert<uint>();
+    public ulong ToUInt64(IFormatProvider provider) => DoConvert<ulong>();
+
+    public float ToSingle(IFormatProvider provider) => DoConvert<float>();
+    public double ToDouble(IFormatProvider provider) => DoConvert<double>();
+
+    public string ToString(IFormatProvider provider) => DoConvert<string>();
+
+    public DateTime ToDateTime(IFormatProvider provider) => throw new InvalidCastException();
+    public decimal ToDecimal(IFormatProvider provider) => throw new InvalidCastException();
+
+    public object ToType(Type conversionType, IFormatProvider provider)
+    {
+        if (Converter.ToManaged(Reference, conversionType, out object? result, setError: false))
+        {
+            return result!;
+        }
+        else
+        {
+            throw new InvalidCastException();
+        }
+    }
+
+}
diff --git a/src/runtime/PythonTypes/PyString.cs b/src/runtime/PythonTypes/PyString.cs
@@ -59,5 +59,7 @@ public static bool IsStringType(PyObject value)
         {
             return Runtime.PyString_Check(value.obj);
         }
+
+        public override TypeCode GetTypeCode() => TypeCode.String;
     }
 }
diff --git a/tests/test_conversion.py b/tests/test_conversion.py
@@ -670,3 +670,10 @@ def test_int_param_resolution_required():
     data = list(mri.MethodA(0x100000000, 10))
     assert len(data) == 10
     assert data[0] == 0
+
+def test_iconvertible_conversion():
+    change_type = System.Convert.ChangeType
+
+    assert 1024 == change_type(1024, System.Int32)
+    assert 1024 == change_type(1024, System.Int64)
+    assert 1024 == change_type(1024, System.Int16)

Original file line number	Diff line number	Diff line change
`@@ -550,7 +550,7 @@ internal static int ToInt32(BorrowedReference value)`
`550`	`550`	`/// <summary>`
`551`	`551`	`/// Convert a Python value to an instance of a primitive managed type.`
`552`	`552`	`/// </summary>`
`553`		`- private static bool ToPrimitive(BorrowedReference value, Type obType, out object? result, bool setError)`
	`553`	`+ internal static bool ToPrimitive(BorrowedReference value, Type obType, out object? result, bool setError)`
`554`	`554`	`{`
`555`	`555`	`result = null;`
`556`	`556`	`if (obType.IsEnum)`
Original file line number	Diff line number	Diff line change
`@@ -101,5 +101,7 @@ public static PyFloat AsFloat(PyObject value)`
`101`	`101`	`PythonException.ThrowIfIsNull(op);`
`102`	`102`	`return new PyFloat(op.Steal());`
`103`	`103`	`}`
	`104`	`+`
	`105`	`+ public override TypeCode GetTypeCode() => TypeCode.Double;`
`104`	`106`	`}`
`105`	`107`	`}`
Original file line number	Diff line number	Diff line change
`@@ -230,5 +230,7 @@ public string ToString(string format, IFormatProvider formatProvider)`
`230`	`230`	`using var _ = Py.GIL();`
`231`	`231`	`return ToBigInteger().ToString(format, formatProvider);`
`232`	`232`	`}`
	`233`	`+`
	`234`	`+ public override TypeCode GetTypeCode() => TypeCode.Int64;`
`233`	`235`	`}`
`234`	`236`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,5 +59,7 @@ public static bool IsStringType(PyObject value)`
`59`	`59`	`{`
`60`	`60`	`return Runtime.PyString_Check(value.obj);`
`61`	`61`	`}`
	`62`	`+`
	`63`	`+ public override TypeCode GetTypeCode() => TypeCode.String;`
`62`	`64`	`}`
`63`	`65`	`}`