Try to guess the correct element type from an enumerator, use in conversion

filmor · filmor · commit f1df348e14ce · 2019-09-27T08:14:26.000+02:00
diff --git a/src/runtime/converter.cs b/src/runtime/converter.cs
@@ -155,7 +155,7 @@ internal static IntPtr ToPython(object value, Type type)
             // type is. we'd rather have the object bound to the actual
             // implementing class.
 
-            type = value.GetType();
+            type = type ?? value.GetType();
 
             TypeCode tc = Type.GetTypeCode(type);
 
diff --git a/src/runtime/iterator.cs b/src/runtime/iterator.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using System;
 using System.Collections;
 
@@ -10,10 +11,18 @@ namespace Python.Runtime
     internal class Iterator : ExtensionType
     {
         private IEnumerator iter;
+        private Type type;
 
         public Iterator(IEnumerator e)
         {
             iter = e;
+
+            var genericType = e.GetType().GetInterfaces().FirstOrDefault(
+                x => x.IsGenericType &&
+                x.GetGenericTypeDefinition() == typeof(System.Collections.Generic.IEnumerator<>)
+            );
+
+            type = genericType?.GetGenericArguments().FirstOrDefault();
         }
 
 
@@ -41,7 +50,7 @@ public static IntPtr tp_iternext(IntPtr ob)
                 return IntPtr.Zero;
             }
             object item = self.iter.Current;
-            return Converter.ToPythonImplicit(item);
+            return Converter.ToPython(item, type);
         }
 
         public static IntPtr tp_iter(IntPtr ob)

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+using System.Linq;`
`1`	`2`	`using System;`
`2`	`3`	`using System.Collections;`
`3`	`4`
`@@ -10,10 +11,18 @@ namespace Python.Runtime`
`10`	`11`	`internal class Iterator : ExtensionType`
`11`	`12`	`{`
`12`	`13`	`private IEnumerator iter;`
	`14`	`+ private Type type;`
`13`	`15`
`14`	`16`	`public Iterator(IEnumerator e)`
`15`	`17`	`{`
`16`	`18`	`iter = e;`
	`19`	`+`
	`20`	`+ var genericType = e.GetType().GetInterfaces().FirstOrDefault(`
	`21`	`+ x => x.IsGenericType &&`
	`22`	`+ x.GetGenericTypeDefinition() == typeof(System.Collections.Generic.IEnumerator<>)`
	`23`	`+ );`
	`24`	`+`
	`25`	`+ type = genericType?.GetGenericArguments().FirstOrDefault();`
`17`	`26`	`}`
`18`	`27`
`19`	`28`
`@@ -41,7 +50,7 @@ public static IntPtr tp_iternext(IntPtr ob)`
`41`	`50`	`return IntPtr.Zero;`
`42`	`51`	`}`
`43`	`52`	`object item = self.iter.Current;`
`44`		`- return Converter.ToPythonImplicit(item);`
	`53`	`+ return Converter.ToPython(item, type);`
`45`	`54`	`}`
`46`	`55`
`47`	`56`	`public static IntPtr tp_iter(IntPtr ob)`