Commit4f689a9

committed

Take the GIL when converting enum to int

1 parenta6e4353 commit4f689a9Copy full SHA for 4f689a9

File tree

+20

-4

lines changed

+20

-4

lines changed

Lines changed: 14 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -82,10 +82,20 @@ internal static class EnumOps<T> where T : Enum`
`82`	`82`	`{`
`83`	`83`	`[ForbidPythonThreads]`
`84`	`84`	`#pragma warning disableIDE1006// Naming Styles - must match Python`
`85`		`-publicstaticPyInt__int__(Tvalue)`
	`85`	`+publicstaticPyInt__int__(Tvalue){`
`86`	`86`	`#pragma warning restoreIDE1006// Naming Styles`
`87`		`-=>typeof(T).GetEnumUnderlyingType()==typeof(UInt64)`
`88`		`-?newPyInt(Convert.ToUInt64(value))`
`89`		`-:newPyInt(Convert.ToInt64(value));`
	`87`	`+if(typeof(T).GetEnumUnderlyingType()==typeof(UInt64))`
	`88`	`+{`
	`89`	`+varconverted=Convert.ToUInt64(value);`
	`90`	`+usingvar_=Py.GIL();`
	`91`	`+returnnewPyInt(converted);`
	`92`	`+}`
	`93`	`+else`
	`94`	`+{`
	`95`	`+varconverted=Convert.ToInt64(value);`
	`96`	`+usingvar_=Py.GIL();`
	`97`	`+returnnewPyInt(converted);`
	`98`	`+}`
	`99`	`+}`
`90`	`100`	`}`
`91`	`101`	`}`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,11 @@ def test_ulong_enum():`
`87`	`87`	`assertTest.ULongEnum.Two==Test.ULongEnum(2)`
`88`	`88`
`89`	`89`
	`90`	`+deftest_simple_enum_to_int():`
	`91`	`+fromSystemimportDayOfWeek`
	`92`	`+assertint(DayOfWeek.Sunday)==0`
	`93`	`+`
	`94`	`+`
`90`	`95`	`deftest_long_enum_to_int():`
`91`	`96`	`assertint(Test.LongEnum.Max)==9223372036854775807`
`92`	`97`	`assertint(Test.LongEnum.Min)==-9223372036854775808`
`@@ -138,6 +143,7 @@ def test_enum_undefined_value():`
`138`	`143`	`# explicitly permit undefined values`
`139`	`144`	`Test.FieldTest().EnumField=Test.ShortEnum(20,True)`
`140`	`145`
	`146`	`+`
`141`	`147`	`deftest_enum_conversion():`
`142`	`148`	`"""Test enumeration conversion."""`
`143`	`149`	`ob=Test.FieldTest()`

Comments

(0)