Sep 26, 2019 · Sep 27, 2019 · Sep 27, 2019 · Sep 27, 2019
diff --git a/src/runtime/converter.cs b/src/runtime/converter.cs
                return result;
            }

 if (value is IList && !(value is INotifyPropertyChanged) && value.GetType().IsGenericType)
 {
                using (var resultlist = new PyList())
                {
                    foreach (object o in (IEnumerable)value)
                    {
                        using (var p = new PyObject(ToPython(o, o?.GetType())))
                        {
                            resultlist.Append(p);
                        }
                    }
                    Runtime.XIncref(resultlist.Handle);
                    return resultlist.Handle;
                }
            }

            // it the type is a python subclass of a managed type then return the
            // underlying python object rather than construct a new wrapper object.
            var pyderived = value as IPythonDerivedType;
            // 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);

                    return Runtime.PyLong_FromUnsignedLongLong((ulong)value);

                default:
                    if (value is IEnumerable)
                    {
                        using (var resultlist = new PyList())
                        {
                            foreach (object o in (IEnumerable)value)
                            {
                                using (var p = new PyObject(ToPython(o, o?.GetType())))
                                {
                                    resultlist.Append(p);
                                }
                            }
                            Runtime.XIncref(resultlist.Handle);
                            return resultlist.Handle;
                        }
                    }
                    result = CLRObject.GetInstHandle(value, type);
                    return result;
            }

            var listType = typeof(List<>);
            var constructedListType = listType.MakeGenericType(elementType);
            IList list = IsSeqObj ? (IList) Activator.CreateInstance(constructedListType, new Object[] {(int) len}) :
            IList list = IsSeqObj ? (IList) Activator.CreateInstance(constructedListType, new Object[] {(int) len}) :
                                        (IList) Activator.CreateInstance(constructedListType);
            IntPtr item;


            items = Array.CreateInstance(elementType, list.Count);
            list.CopyTo(items, 0);


            result = items;
            return true;
        }
diff --git a/src/runtime/iterator.cs b/src/runtime/iterator.cs
 using System.Linq;
 using System;
 using System.Collections;

    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();
        }


                return IntPtr.Zero;
            }
            object item = self.iter.Current;
            return Converter.ToPythonImplicit(item);
            return Converter.ToPython(item, self.type);
        }

        public static IntPtr tp_iter(IntPtr ob)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -135,22 +135,6 @@ internal static IntPtr ToPython(object value, Type type)
		return result;
		}

		if (value is IList && !(value is INotifyPropertyChanged) && value.GetType().IsGenericType)
		{
		using (var resultlist = new PyList())
		{
		foreach (object o in (IEnumerable)value)
		{
		using (var p = new PyObject(ToPython(o, o?.GetType())))
		{
		resultlist.Append(p);
		}
		}
		Runtime.XIncref(resultlist.Handle);
		return resultlist.Handle;
		}
		}

		// it the type is a python subclass of a managed type then return the
		// underlying python object rather than construct a new wrapper object.
		var pyderived = value as IPythonDerivedType;
Expand All		@@ -171,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);

Expand DownExpand Up		@@ -231,21 +215,6 @@ internal static IntPtr ToPython(object value, Type type)
		return Runtime.PyLong_FromUnsignedLongLong((ulong)value);

		default:
		if (value is IEnumerable)
		{
		using (var resultlist = new PyList())
		{
		foreach (object o in (IEnumerable)value)
		{
		using (var p = new PyObject(ToPython(o, o?.GetType())))
		{
		resultlist.Append(p);
		}
		}
		Runtime.XIncref(resultlist.Handle);
		return resultlist.Handle;
		}
		}
		result = CLRObject.GetInstHandle(value, type);
		return result;
		}
Expand DownExpand Up		@@ -862,7 +831,7 @@ private static bool ToArray(IntPtr value, Type obType, out object result, bool s

		var listType = typeof(List<>);
		var constructedListType = listType.MakeGenericType(elementType);
		IList list = IsSeqObj ? (IList) Activator.CreateInstance(constructedListType, new Object[] {(int) len}) :
		IList list = IsSeqObj ? (IList) Activator.CreateInstance(constructedListType, new Object[] {(int) len}) :
		(IList) Activator.CreateInstance(constructedListType);
		IntPtr item;

Expand All		@@ -883,7 +852,7 @@ private static bool ToArray(IntPtr value, Type obType, out object result, bool s

		items = Array.CreateInstance(elementType, list.Count);
		list.CopyTo(items, 0);


		result = items;
		return true;
		}
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1,4 @@
		using System.Linq;
		using System;
		using System.Collections;

Expand All		@@ -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();
		}


Expand DownExpand Up		@@ -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, self.type);
		}

		public static IntPtr tp_iter(IntPtr ob)
Expand Down