Take the GIL in sequence and list wrappers

filmor · filmor · commit cb16d0183706 · 2025-12-09T08:08:22.000+01:00
diff --git a/src/runtime/CollectionWrappers/ListWrapper.cs b/src/runtime/CollectionWrappers/ListWrapper.cs
@@ -14,12 +14,14 @@ public T this[int index]
         {
             get
             {
+                using var _ = Py.GIL();
                 var item = Runtime.PyList_GetItem(pyObject, index);
                 var pyItem = new PyObject(item);
                 return pyItem.As<T>()!;
             }
             set
             {
+                using var _ = Py.GIL();
                 var pyItem = value.ToPython();
                 var result = Runtime.PyList_SetItem(pyObject, index, new NewReference(pyItem).Steal());
                 if (result == -1)
@@ -37,6 +39,7 @@ public void Insert(int index, T item)
             if (IsReadOnly)
                 throw new InvalidOperationException("Collection is read-only");
 
+            using var _ = Py.GIL();
             var pyItem = item.ToPython();
 
             int result = Runtime.PyList_Insert(pyObject, index, pyItem);
diff --git a/src/runtime/CollectionWrappers/SequenceWrapper.cs b/src/runtime/CollectionWrappers/SequenceWrapper.cs
@@ -14,10 +14,14 @@ public int Count
         {
             get
             {
-                var size = Runtime.PySequence_Size(pyObject.Reference);
-                if (size == -1)
+                nint size = -1;
                 {
-                    Runtime.CheckExceptionOccurred();
+                    using var _ = Py.GIL();
+                    size = Runtime.PySequence_Size(pyObject.Reference);
+                    if (size == -1)
+                    {
+                        Runtime.CheckExceptionOccurred();
+                    }
                 }
 
                 return checked((int)size);
@@ -38,6 +42,7 @@ public void Clear()
         {
             if (IsReadOnly)
                 throw new NotImplementedException();
+            using var _ = Py.GIL();
             int result = Runtime.PySequence_DelSlice(pyObject, 0, Count);
             if (result == -1)
             {
@@ -77,12 +82,16 @@ protected bool removeAt(int index)
             if (index >= Count || index < 0)
                 return false;
 
-            int result = Runtime.PySequence_DelItem(pyObject, index);
 
-            if (result == 0)
-                return true;
+            {
+                using var _ = Py.GIL();
+                int result = Runtime.PySequence_DelItem(pyObject, index);
+
+                if (result == 0)
+                    return true;
 
-            Runtime.CheckExceptionOccurred();
+                Runtime.CheckExceptionOccurred();
+            }
             return false;
         }
 
diff --git a/tests/test_codec.py b/tests/test_codec.py
@@ -59,7 +59,6 @@ def test_iterable():
     assert 3 == ob.GetLength2(iterable2)
 
 
-@pytest.mark.skip
 def test_sequence():
     Python.Runtime.Codecs.SequenceDecoder.Register()
     ob = ListConversionTester()
@@ -71,7 +70,6 @@ def test_sequence():
     assert 3 == ob.GetLength(tup2)
 
 
-@pytest.mark.skip
 def test_list():
     Python.Runtime.Codecs.SequenceDecoder.Register()
     ob = ListConversionTester()

Original file line number	Diff line number	Diff line change
`@@ -14,12 +14,14 @@ public T this[int index]`
`14`	`14`	`{`
`15`	`15`	`get`
`16`	`16`	`{`
	`17`	`+ using var _ = Py.GIL();`
`17`	`18`	`var item = Runtime.PyList_GetItem(pyObject, index);`
`18`	`19`	`var pyItem = new PyObject(item);`
`19`	`20`	`return pyItem.As<T>()!;`
`20`	`21`	`}`
`21`	`22`	`set`
`22`	`23`	`{`
	`24`	`+ using var _ = Py.GIL();`
`23`	`25`	`var pyItem = value.ToPython();`
`24`	`26`	`var result = Runtime.PyList_SetItem(pyObject, index, new NewReference(pyItem).Steal());`
`25`	`27`	`if (result == -1)`
`@@ -37,6 +39,7 @@ public void Insert(int index, T item)`
`37`	`39`	`if (IsReadOnly)`
`38`	`40`	`throw new InvalidOperationException("Collection is read-only");`
`39`	`41`
	`42`	`+ using var _ = Py.GIL();`
`40`	`43`	`var pyItem = item.ToPython();`
`41`	`44`
`42`	`45`	`int result = Runtime.PyList_Insert(pyObject, index, pyItem);`