Commit7e7cbca

authored

Disable implicit conversion from PyFloat to uint64 (#1362)

1 parent5fd77b1 commit7e7cbcaCopy full SHA for 7e7cbca

File tree

-12

lines changed

-12

lines changed

Lines changed: 2 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -698,19 +698,10 @@ private static bool ToPrimitive(IntPtr value, Type obType, out object result, bo`
`698`	`698`
`699`	`699`	`caseTypeCode.UInt64:`
`700`	`700`	`{`
`701`		`-op=value;`
`702`		`-if(Runtime.PyObject_TYPE(value)!=Runtime.PyLongType)`
`703`		`-{`
`704`		`-op=Runtime.PyNumber_Long(value);`
`705`		`-if(op==IntPtr.Zero)`
`706`		`-{`
`707`		`-gotoconvert_error;`
`708`		`-}`
`709`		`-}`
`710`		`-ulongnum=Runtime.PyLong_AsUnsignedLongLong(op);`
	`701`	`+ulongnum=Runtime.PyLong_AsUnsignedLongLong(value);`
`711`	`702`	`if(num==ulong.MaxValue&&Exceptions.ErrorOccurred())`
`712`	`703`	`{`
`713`		`-gotooverflow;`
	`704`	`+gotoconvert_error;`
`714`	`705`	`}`
`715`	`706`	`result=num;`
`716`	`707`	`returntrue;`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -382,7 +382,10 @@ def test_uint64_conversion():`
`382`	`382`	`ob.UInt64Field=System.UInt64(0)`
`383`	`383`	`assertob.UInt64Field==0`
`384`	`384`
`385`		`-withpytest.raises(ValueError):`
	`385`	`+withpytest.raises(TypeError):`
	`386`	`+ConversionTest().UInt64Field=0.5`
	`387`	`+`
	`388`	`+withpytest.raises(TypeError):`
`386`	`389`	`ConversionTest().UInt64Field="spam"`
`387`	`390`
`388`	`391`	`withpytest.raises(TypeError):`

Comments

(0)