Fix decimal default parameters (#1773)

filmor · web-flow · commit 7247da55c174 · 2022-04-26T09:11:58.000-07:00
* Drop outdated work around to fix decimal default parameters
* Add test for Decimal default parameter
* Update changelog
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -113,6 +113,7 @@ Instead, `PyIterable` does that.
 -   Unicode strings with surrogates were truncated when converting from Python
 -   `Reload` mode now supports generic methods (previously Python would stop seeing them after reload)
 -   Temporarily fixed issue resolving method overload when method signature has `out` parameters ([#1672](i1672))
+-   Decimal default parameters are now correctly taken into account
 
 ### Removed
 
diff --git a/src/runtime/MethodBinder.cs b/src/runtime/MethodBinder.cs
@@ -1072,11 +1072,7 @@ static internal class ParameterInfoExtensions
     {
         public static object? GetDefaultValue(this ParameterInfo parameterInfo)
         {
-            // parameterInfo.HasDefaultValue is preferable but doesn't exist in .NET 4.0
-            bool hasDefaultValue = (parameterInfo.Attributes & ParameterAttributes.HasDefault) ==
-                ParameterAttributes.HasDefault;
-
-            if (hasDefaultValue)
+            if (parameterInfo.HasDefaultValue)
             {
                 return parameterInfo.DefaultValue;
             }
diff --git a/src/testing/Python.Test.csproj b/src/testing/Python.Test.csproj
@@ -5,6 +5,7 @@
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
     <AssemblyOriginatorKeyFile>..\pythonnet.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
+    <NoWarn>IDE0051;IDE0060</NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\runtime\Python.Runtime.csproj" />
diff --git a/src/testing/methodtest.cs b/src/testing/methodtest.cs
@@ -258,6 +258,11 @@ public static int TestSingleDefaultParam(int i = 5)
             return i;
         }
 
+        public static decimal TestDecimalDefaultParam(decimal n = 1m)
+        {
+            return n;
+        }
+
         public static int TestTwoDefaultParam(int i = 5, int j = 6)
         {
             return i + j;
diff --git a/tests/test_method.py b/tests/test_method.py
@@ -441,6 +441,12 @@ def test_single_default_param():
     assert result == 5
 
 
+def test_decimal_default_param():
+    """Test that decimal default parameters work."""
+    result = MethodTest.TestDecimalDefaultParam()
+    assert result == System.Decimal(1)
+
+
 def test_one_arg_and_two_default_param():
     """Test void method with single ref-parameter."""
     result = MethodTest.TestOneArgAndTwoDefaultParam(11)

Original file line number	Diff line number	Diff line change
`@@ -1072,11 +1072,7 @@ static internal class ParameterInfoExtensions`
`1072`	`1072`	`{`
`1073`	`1073`	`public static object? GetDefaultValue(this ParameterInfo parameterInfo)`
`1074`	`1074`	`{`
`1075`		`- // parameterInfo.HasDefaultValue is preferable but doesn't exist in .NET 4.0`
`1076`		`- bool hasDefaultValue = (parameterInfo.Attributes & ParameterAttributes.HasDefault) ==`
`1077`		`- ParameterAttributes.HasDefault;`
`1078`		`-`
`1079`		`- if (hasDefaultValue)`
	`1075`	`+ if (parameterInfo.HasDefaultValue)`
`1080`	`1076`	`{`
`1081`	`1077`	`return parameterInfo.DefaultValue;`
`1082`	`1078`	`}`
Original file line number	Diff line number	Diff line change
`@@ -258,6 +258,11 @@ public static int TestSingleDefaultParam(int i = 5)`
`258`	`258`	`return i;`
`259`	`259`	`}`
`260`	`260`
	`261`	`+ public static decimal TestDecimalDefaultParam(decimal n = 1m)`
	`262`	`+ {`
	`263`	`+ return n;`
	`264`	`+ }`
	`265`	`+`
`261`	`266`	`public static int TestTwoDefaultParam(int i = 5, int j = 6)`
`262`	`267`	`{`
`263`	`268`	`return i + j;`