Take the GIL when converting enum to int

filmor · filmor · commit aa471fc8cc05 · 2022-06-09T09:58:38.000+02:00
diff --git a/src/runtime/Util/OpsHelper.cs b/src/runtime/Util/OpsHelper.cs
@@ -80,12 +80,21 @@ static Func<T, T> UnaryOp(Func<Expression, UnaryExpression> op)
     [Ops]
     internal static class EnumOps<T> where T : Enum
     {
-        [ForbidPythonThreads]
 #pragma warning disable IDE1006 // Naming Styles - must match Python
-        public static PyInt __int__(T value)
+        public static PyInt __int__(T value) {
 #pragma warning restore IDE1006 // Naming Styles
-            => typeof(T).GetEnumUnderlyingType() == typeof(UInt64)
-            ? new PyInt(Convert.ToUInt64(value))
-            : new PyInt(Convert.ToInt64(value));
+            if (typeof(T).GetEnumUnderlyingType() == typeof(UInt64))
+            {
+                var converted = Convert.ToUInt64(value);
+                using var _ = Py.GIL();
+                return new PyInt(converted);
+            }
+            else
+            {
+                var converted = Convert.ToInt64(value);
+                using var _ = Py.GIL();
+                return new PyInt(converted);
+            }
+        }
     }
 }
diff --git a/tests/test_enum.py b/tests/test_enum.py
@@ -87,6 +87,11 @@ def test_ulong_enum():
     assert Test.ULongEnum.Two == Test.ULongEnum(2)
 
 
+def test_simple_enum_to_int():
+    from System import DayOfWeek
+    assert int(DayOfWeek.Sunday) == 0
+
+
 def test_long_enum_to_int():
     assert int(Test.LongEnum.Max) == 9223372036854775807
     assert int(Test.LongEnum.Min) == -9223372036854775808
@@ -138,6 +143,7 @@ def test_enum_undefined_value():
     # explicitly permit undefined values
     Test.FieldTest().EnumField = Test.ShortEnum(20, True)
 
+
 def test_enum_conversion():
     """Test enumeration conversion."""
     ob = Test.FieldTest()
