Commitb4738fe

dhirschf

committed

Allow passing None for nullable args

1 parent67650a2 commitb4738feCopy full SHA for b4738fe

File tree

+24

-0

lines changed

+24

-0

lines changed

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -318,6 +318,17 @@ internal static bool ToManagedValue(IntPtr value, Type obType,`
`318`	`318`	`returntrue;`
`319`	`319`	`}`
`320`	`320`
	`321`	`+if(obType.IsGenericType&&obType.GetGenericTypeDefinition()==typeof(Nullable<>))`
	`322`	`+{`
	`323`	`+if(value==Runtime.PyNone)`
	`324`	`+{`
	`325`	`+result=null;`
	`326`	`+returntrue;`
	`327`	`+}`
	`328`	`+// Set type to underlying type`
	`329`	`+obType=obType.GetGenericArguments()[0];`
	`330`	`+}`
	`331`	`+`
`321`	`332`	`if(obType.IsArray)`
`322`	`333`	`{`
`323`	`334`	`returnToArray(value,obType,outresult,setError);`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,14 @@ public ConversionTest()`
`32`	`32`
`33`	`33`	`publicbyte[]ByteArrayField;`
`34`	`34`	`publicsbyte[]SByteArrayField;`
	`35`	`+`
	`36`	`+publicT?Echo<T>(T?arg)whereT:struct{`
	`37`	`+returnarg;`
	`38`	`+}`
	`39`	`+`
`35`	`40`	`}`
`36`	`41`
	`42`	`+`
`37`	`43`
`38`	`44`	`publicinterfaceISpam`
`39`	`45`	`{`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -641,6 +641,9 @@ def test_enum_conversion():`
`641`	`641`
`642`	`642`	`deftest_null_conversion():`
`643`	`643`	`"""Test null conversion."""`
	`644`	`+importclr`
	`645`	`+importSystem`
	`646`	`+`
`644`	`647`	`ob=ConversionTest()`
`645`	`648`
`646`	`649`	`ob.StringField=None`
`@@ -652,6 +655,10 @@ def test_null_conversion():`
`652`	`655`	`ob.SpamField=None`
`653`	`656`	`assertob.SpamFieldisNone`
`654`	`657`
	`658`	`+pi=22/7`
	`659`	`+assertob.Echo[System.Double](pi)==pi`
	`660`	`+assertob.Echo[System.DateTime](None)isNone`
	`661`	`+`
`655`	`662`	`# Primitive types and enums should not be set to null.`
`656`	`663`
`657`	`664`	`withpytest.raises(TypeError):`

Comments

(0)