Call Reset by proxy to keep it internal

pythonnet · filmor · Apr 25, 2022 · Apr 10, 2022 · Apr 10, 2022 · Apr 22, 2022
commit 58deb60bb9401573dfd9ba40a5ee0f783c657b83
diff --git a/src/runtime/Codecs/PyObjectConversions.cs b/src/runtime/Codecs/PyObjectConversions.cs
@@ -125,7 +125,7 @@ bool TryDecode(BorrowedReference pyHandle, out object? result)
 
         #endregion
 
-        public static void Reset()
+        internal static void Reset()
         {
             lock (encoders)
                 lock (decoders)

diff --git a/src/testing/CodecTest.cs b/src/testing/CodecTest.cs
@@ -44,4 +44,12 @@ public int GetLength2(IList<ListMember> o)
             return o.Count;
         }
     }
+
+    public static class CodecResetter
+    {
+        public static void Reset()
+        {
+            PyObjectConversions.Reset();
+        }
+    }
 }
diff --git a/tests/test_codec.py b/tests/test_codec.py
@@ -1,49 +1,49 @@
-# -*- coding: utf-8 -*-
-
-"""Test conversions using codecs from client python code"""
-import clr
-import System
-import pytest
-import Python.Runtime
-from Python.Test import ListConversionTester, ListMember
-
-class int_iterable():
-    def __init__(self):
-        self.counter = 0
-    def __iter__(self):
-        return self
-    def __next__(self):
-        if self.counter == 3:
-            raise StopIteration
-        self.counter = self.counter + 1
-        return self.counter
+# -*- coding: utf-8 -*-
+
+"""Test conversions using codecs from client python code"""
+import clr
+import System
+import pytest
+import Python.Runtime
+from Python.Test import ListConversionTester, ListMember, CodecResetter
+
+class int_iterable():
+    def __init__(self):
+        self.counter = 0
+    def __iter__(self):
+        return self
+    def __next__(self):
+        if self.counter == 3:
+            raise StopIteration
+        self.counter = self.counter + 1
+        return self.counter
 
 class obj_iterable():
-    def __init__(self):
-        self.counter = 0
-    def __iter__(self):
-        return self
-    def __next__(self):
-        if self.counter == 3:
-            raise StopIteration
+    def __init__(self):
+        self.counter = 0
+    def __iter__(self):
+        return self
+    def __next__(self):
+        if self.counter == 3:
+            raise StopIteration
         self.counter = self.counter + 1
         return ListMember(self.counter, "Number " + str(self.counter))
-
-def test_iterable():
-    """Test that a python iterable can be passed into a function that takes an IEnumerable<object>"""
-
-    #Python.Runtime.Codecs.ListDecoder.Register()
-    #Python.Runtime.Codecs.SequenceDecoder.Register()
-    Python.Runtime.Codecs.IterableDecoder.Register()
+
+def test_iterable():
+    """Test that a python iterable can be passed into a function that takes an IEnumerable<object>"""
+
+    #Python.Runtime.Codecs.ListDecoder.Register()
+    #Python.Runtime.Codecs.SequenceDecoder.Register()
+    Python.Runtime.Codecs.IterableDecoder.Register()
     ob = ListConversionTester()
 
-    iterable = int_iterable()
+    iterable = int_iterable()
     assert 3 == ob.GetLength(iterable)
 
     iterable2 = obj_iterable()
     assert 3 == ob.GetLength2(iterable2)
 
-    Python.Runtime.PyObjectConversions.Reset()
+    CodecResetter.Reset()
 
 def test_sequence():
     Python.Runtime.Codecs.SequenceDecoder.Register()
@@ -55,7 +55,7 @@ def test_sequence():
     tup2 = (ListMember(1, "one"), ListMember(2, "two"), ListMember(3, "three"))
     assert 3 == ob.GetLength(tup2)
 
-    Python.Runtime.PyObjectConversions.Reset()
+    CodecResetter.Reset()
 
 def test_list():
     Python.Runtime.Codecs.SequenceDecoder.Register()
@@ -67,4 +67,4 @@ def test_list():
     l2 = [ListMember(1, "one"), ListMember(2, "two"), ListMember(3, "three")]
     assert 3 == ob.GetLength(l2)
 
-    Python.Runtime.PyObjectConversions.Reset()
+    CodecResetter.Reset()