pFad - Phonifier reborn

From 29a3260f3be21d8eaf40c67b0a9ba0641cd709ae Mon Sep 17 00:00:00 2001 From: Benedikt Reinartz Date: Sun, 10 Apr 2022 18:28:18 +0200 Subject: [PATCH 1/5] Move test_codec.py to the right directory --- {src/tests => tests}/test_codec.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {src/tests => tests}/test_codec.py (100%) diff --git a/src/tests/test_codec.py b/tests/test_codec.py similarity index 100% rename from src/tests/test_codec.py rename to tests/test_codec.py From 15de5e902baa2acb260a9ddee6ebb35e6f990899 Mon Sep 17 00:00:00 2001 From: Benedikt Reinartz Date: Sun, 10 Apr 2022 18:48:50 +0200 Subject: [PATCH 2/5] Make PyObjectConversions.Reset public to allow calling it from Python --- src/runtime/Codecs/PyObjectConversions.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/runtime/Codecs/PyObjectConversions.cs b/src/runtime/Codecs/PyObjectConversions.cs index 94ed4cdc3..0be9ab93e 100644 --- a/src/runtime/Codecs/PyObjectConversions.cs +++ b/src/runtime/Codecs/PyObjectConversions.cs @@ -125,7 +125,7 @@ bool TryDecode(BorrowedReference pyHandle, out object? result) #endregion - internal static void Reset() + public static void Reset() { lock (encoders) lock (decoders) From 58deb60bb9401573dfd9ba40a5ee0f783c657b83 Mon Sep 17 00:00:00 2001 From: Benedikt Reinartz Date: Fri, 22 Apr 2022 19:26:12 +0200 Subject: [PATCH 3/5] Call Reset by proxy to keep it internal --- src/runtime/Codecs/PyObjectConversions.cs | 2 +- src/testing/CodecTest.cs | 8 +++ tests/test_codec.py | 74 +++++++++++------------ 3 files changed, 46 insertions(+), 38 deletions(-) diff --git a/src/runtime/Codecs/PyObjectConversions.cs b/src/runtime/Codecs/PyObjectConversions.cs index 0be9ab93e..94ed4cdc3 100644 --- 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 index 74f77531b..db89b218e 100644 --- a/src/testing/CodecTest.cs +++ b/src/testing/CodecTest.cs @@ -44,4 +44,12 @@ public int GetLength2(IList 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 index 9fdbfbbf5..9744d3856 100644 --- 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

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.