Aug 21, 2021 · Aug 23, 2021 · Aug 25, 2021 · Aug 25, 2021
diff --git a/src/runtime/converter.cs b/src/runtime/converter.cs
        private static Type int64Type;
        private static Type boolType;
        private static Type typeType;
        private static Type uint64Type;
        private static Type uint32Type;

        static Converter()
        {
            decimalType = typeof(Decimal);
            boolType = typeof(Boolean);
            typeType = typeof(Type);
            uint64Type = typeof(UInt64);
            uint32Type = typeof(UInt32);
        }


        /// <summary>
        /// Given a builtin Python type, return the corresponding CLR type.
        /// </summary>
        internal static Type GetTypeByAlias(IntPtr op)
        internal static Type GetTypeByAlias(IntPtr op, Type preferred=null)
        {
            if (op == Runtime.PyStringType)
                return stringType;

            if (op == Runtime.PyUnicodeType)
                return stringType;

            if (op == Runtime.PyIntType)
            if (op == Runtime.PyIntType && (preferred == null || preferred == int32Type))
                return int32Type;

            if (op == Runtime.PyLongType)
            if (op == Runtime.PyIntType && (preferred == null || preferred == uint32Type))
                return uint32Type;

            if (op == Runtime.PyLongType && (preferred == null || preferred == int64Type))
                return int64Type;

            if (op == Runtime.PyLongType && (preferred == null || preferred == uint64Type))
                return uint64Type;

            if (op == Runtime.PyFloatType)
                return doubleType;

diff --git a/src/runtime/methodbinder.cs b/src/runtime/methodbinder.cs
                ManagedArgs = margs;
                Outs = outs;
                Method = mb;
                HasPyObjectParameter = mb.GetParameters().Any(x => x.ParameterType == typeof(PyObject));
            }

            public int KwargsMatched { get; }
            public int DefaultsNeeded { get; }
            public object[] ManagedArgs { get; }
            public int Outs { get; }
            public MethodBase Method { get; }
            public bool HasPyObjectParameter { get; }
        }

        private readonly struct MismatchedMethod
                var matchedMethod = new MatchedMethod(kwargsMatched, defaultsNeeded, margs, outs, mi);
                argMatchedMethods.Add(matchedMethod);
            }

            if (argMatchedMethods.Count > 0)
            {
                // order the matched methods such that PyObject overrides are last, we only care about
                // this when there is more than one arg matched method
                if (argMatchedMethods.Count > 1)
                {
                    argMatchedMethods = argMatchedMethods.OrderBy(x => x.HasPyObjectParameter).ToList();
                }
                var bestKwargMatchCount = argMatchedMethods.Max(x => x.KwargsMatched);
                var fewestDefaultsRequired = argMatchedMethods.Where(x => x.KwargsMatched == bestKwargMatchCount).Min(x => x.DefaultsNeeded);

                pyoptype = Runtime.PyObject_Type(argument);
                if (pyoptype != IntPtr.Zero)
                {
                    clrtype = Converter.GetTypeByAlias(pyoptype);
                    clrtype = Converter.GetTypeByAlias(pyoptype, parameterType);
                }
                Runtime.XDecref(pyoptype);
            }
diff --git a/src/testing/conversiontest.cs b/src/testing/conversiontest.cs

    }




    public interface ISpam
    {
            return value;
        }
    }


    public class UnicodeString
    {
        public string value = "안녕";
            return value;
        }
    }

    public class MethodResolutionInt
    {
        public IEnumerable<byte> MethodA(ulong address, int size)
        {
            return new byte[10];
        }

        public int MethodA(string dummy, ulong address, int size)
        {
            return 0;
        }
    }
 }
diff --git a/tests/test_conversion.py b/tests/test_conversion.py
 import pytest

 import System
 from Python.Test import ConversionTest, UnicodeString
 from Python.Test import ConversionTest, UnicodeString, MethodResolutionInt
 from Python.Runtime import PyObjectConversions
 from Python.Runtime.Codecs import RawProxyEncoder

    l = ob.ListField
    l.Add(42)
    assert ob.ListField.Count == 1

 def test_int_param_resolution_required():
    """Test resolution of `int` parameters when resolution is needed"""

    mri = MethodResolutionInt()
    data = list(mri.MethodA(0x1000, 10))
    assert len(data) == 10
    assert data[0] == 0

    data = list(mri.MethodA(0x100000000, 10))
    assert len(data) == 10
    assert data[0] == 0
Original file line number	Diff line number	Diff line change
Expand Up		@@ -29,6 +29,8 @@ private Converter()
		private static Type int64Type;
		private static Type boolType;
		private static Type typeType;
		private static Type uint64Type;
		private static Type uint32Type;

		static Converter()
		{
Expand All		@@ -43,26 +45,34 @@ static Converter()
		decimalType = typeof(Decimal);
		boolType = typeof(Boolean);
		typeType = typeof(Type);
		uint64Type = typeof(UInt64);
		uint32Type = typeof(UInt32);
		}


		/// <summary>
		/// Given a builtin Python type, return the corresponding CLR type.
		/// </summary>
		internal static Type GetTypeByAlias(IntPtr op)
		internal static Type GetTypeByAlias(IntPtr op, Type preferred=null)
		{
		if (op == Runtime.PyStringType)
		return stringType;

		if (op == Runtime.PyUnicodeType)
		return stringType;

		if (op == Runtime.PyIntType)
		if (op == Runtime.PyIntType && (preferred == null \|\| preferred == int32Type))
		return int32Type;

		if (op == Runtime.PyLongType)
		if (op == Runtime.PyIntType && (preferred == null \|\| preferred == uint32Type))
		return uint32Type;

		if (op == Runtime.PyLongType && (preferred == null \|\| preferred == int64Type))
		return int64Type;

		if (op == Runtime.PyLongType && (preferred == null \|\| preferred == uint64Type))
		return uint64Type;

		if (op == Runtime.PyFloatType)
		return doubleType;

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -330,13 +330,15 @@ public MatchedMethod(int kwargsMatched, int defaultsNeeded, object[] margs, int
		ManagedArgs = margs;
		Outs = outs;
		Method = mb;
		HasPyObjectParameter = mb.GetParameters().Any(x => x.ParameterType == typeof(PyObject));
		}

		public int KwargsMatched { get; }
		public int DefaultsNeeded { get; }
		public object[] ManagedArgs { get; }
		public int Outs { get; }
		public MethodBase Method { get; }
		public bool HasPyObjectParameter { get; }
		}

		private readonly struct MismatchedMethod
Expand DownExpand Up		@@ -470,8 +472,15 @@ internal Binding Bind(IntPtr inst, IntPtr args, IntPtr kw, MethodBase info, Meth
		var matchedMethod = new MatchedMethod(kwargsMatched, defaultsNeeded, margs, outs, mi);
		argMatchedMethods.Add(matchedMethod);
		}

		if (argMatchedMethods.Count > 0)
		{
		// order the matched methods such that PyObject overrides are last, we only care about
		// this when there is more than one arg matched method
		if (argMatchedMethods.Count > 1)
		{
		argMatchedMethods = argMatchedMethods.OrderBy(x => x.HasPyObjectParameter).ToList();
Copy link Member lostmsuAug 25, 2021 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. What is the scenario? Why is this change needed?
		}
		var bestKwargMatchCount = argMatchedMethods.Max(x => x.KwargsMatched);
		var fewestDefaultsRequired = argMatchedMethods.Where(x => x.KwargsMatched == bestKwargMatchCount).Min(x => x.DefaultsNeeded);

Expand DownExpand Up		@@ -725,7 +734,7 @@ static Type TryComputeClrArgumentType(Type parameterType, IntPtr argument, bool
		pyoptype = Runtime.PyObject_Type(argument);
		if (pyoptype != IntPtr.Zero)
		{
		clrtype = Converter.GetTypeByAlias(pyoptype);
		clrtype = Converter.GetTypeByAlias(pyoptype, parameterType);
		}
		Runtime.XDecref(pyoptype);
		}
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -42,7 +42,7 @@ public ConversionTest()

		}




		public interface ISpam
		{
Expand All		@@ -63,7 +63,7 @@ public string GetValue()
		return value;
		}
		}


		public class UnicodeString
		{
		public string value = "안녕";
Expand All		@@ -78,4 +78,17 @@ public override string ToString()
		return value;
		}
		}

		public class MethodResolutionInt
		{
		public IEnumerable<byte> MethodA(ulong address, int size)
		{
		return new byte[10];
		}

		public int MethodA(string dummy, ulong address, int size)
		{
		return 0;
		}
		}
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,7 +4,7 @@
		import pytest

		import System
		from Python.Test import ConversionTest, UnicodeString
		from Python.Test import ConversionTest, UnicodeString, MethodResolutionInt
		from Python.Runtime import PyObjectConversions
		from Python.Runtime.Codecs import RawProxyEncoder

Expand DownExpand Up		@@ -681,3 +681,15 @@ def CanEncode(self, clr_type):
		l = ob.ListField
		l.Add(42)
		assert ob.ListField.Count == 1

		def test_int_param_resolution_required():
		"""Test resolution of `int` parameters when resolution is needed"""

		mri = MethodResolutionInt()
		data = list(mri.MethodA(0x1000, 10))
		assert len(data) == 10
		assert data[0] == 0

		data = list(mri.MethodA(0x100000000, 10))
		assert len(data) == 10
		assert data[0] == 0