respond to PR feedback

pythonnet · lostmsu · Feb 18, 2021 · Mar 10, 2020 · Mar 10, 2020 · Mar 11, 2020
commit bf2d03896079ebbc14bccbe93aedbbc42c077d77
diff --git a/src/embed_tests/Codecs.cs b/src/embed_tests/Codecs.cs
@@ -98,34 +98,12 @@ static void TupleRoundtripGeneric<T, TTuple>()
             }
         }
 
-        static string GetIntIterableCommands(string instanceName)
-        {
-            var builder = new System.Text.StringBuilder();
-            builder.AppendLine(@"
-class foo():
-    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");
-
-            builder.AppendLine(instanceName + " = foo()");
-            return builder.ToString();
-        }
-
         static PyObject GetPythonIterable()
         {
-            var locals = new PyDict();
             using (Py.GIL())
             {
-                PythonEngine.Exec(GetIntIterableCommands("foo_instance"), null, locals.Handle);
+                return PythonEngine.Eval("map(lambda x: x, [1,2,3])");
             }
-
-            return locals.GetItem("foo_instance");
         }
 
         [Test]

diff --git a/src/runtime/Codecs/IterableDecoder.cs b/src/runtime/Codecs/IterableDecoder.cs
@@ -19,7 +19,7 @@ internal static bool IsIterable(Type targetType)
 
         internal static bool IsIterable(PyObject objectType)
         {
-            return objectType.HasAttr("__iter__");
+            return Runtime.PyIter_Check(objectType.Handle);
         }
 
         public bool CanDecode(PyObject objectType, Type targetType)

diff --git a/src/runtime/Codecs/ListDecoder.cs b/src/runtime/Codecs/ListDecoder.cs
@@ -15,10 +15,11 @@ private static bool IsList(Type targetType)
 
         private static bool IsList(PyObject objectType)
         {
+            //TODO accept any python object that implements the sequence and list protocols
             //must implement sequence protocol to fully implement list protocol
-            if (!SequenceDecoder.IsSequence(objectType)) return false;
+            //if (!SequenceDecoder.IsSequence(objectType)) return false;
 
-            //returns wheter the type is a list.
+            //returns wheter the type is a list.
             return objectType.Handle == Runtime.PyListType;
         }
 

diff --git a/src/runtime/CollectionWrappers/IterableWrapper.cs b/src/runtime/CollectionWrappers/IterableWrapper.cs
@@ -12,7 +12,7 @@ public IterableWrapper(PyObject pyObj)
         {
             if (pyObj == null)
                 throw new ArgumentNullException();
-            pyObject = pyObj;
+            pyObject = new PyObject(pyObj.Reference);
         }
 
         IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();

diff --git a/src/runtime/CollectionWrappers/SequenceWrapper.cs b/src/runtime/CollectionWrappers/SequenceWrapper.cs
@@ -14,7 +14,7 @@ public int Count
         {
             get
             {
-                var size = Runtime.PySequence_Size(pyObject.Handle);
+                var size = Runtime.PySequence_Size(pyObject.Reference);
                 if (size == -1)
                 {
                     Runtime.CheckExceptionOccurred();