Commitf1df348

committed

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

1 parent8df73d3 commitf1df348Copy full SHA for f1df348

File tree

+11

-2

lines changed

+11

-2

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ internal static IntPtr ToPython(object value, Type type)`
`155`	`155`	`// type is. we'd rather have the object bound to the actual`
`156`	`156`	`// implementing class.`
`157`	`157`
`158`		`-type=value.GetType();`
	`158`	`+type=type??value.GetType();`
`159`	`159`
`160`	`160`	`TypeCodetc=Type.GetTypeCode(type);`
`161`	`161`

Lines changed: 10 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+usingSystem.Linq;`
`1`	`2`	`usingSystem;`
`2`	`3`	`usingSystem.Collections;`
`3`	`4`
`@@ -10,10 +11,18 @@ namespace Python.Runtime`
`10`	`11`	`internalclassIterator:ExtensionType`
`11`	`12`	`{`
`12`	`13`	`privateIEnumeratoriter;`
	`14`	`+privateTypetype;`
`13`	`15`
`14`	`16`	`publicIterator(IEnumeratore)`
`15`	`17`	`{`
`16`	`18`	`iter=e;`
	`19`	`+`
	`20`	`+vargenericType=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`	`returnIntPtr.Zero;`
`42`	`51`	`}`
`43`	`52`	`objectitem=self.iter.Current;`
`44`		`-returnConverter.ToPythonImplicit(item);`
	`53`	`+returnConverter.ToPython(item,type);`
`45`	`54`	`}`
`46`	`55`
`47`	`56`	`publicstaticIntPtrtp_iter(IntPtrob)`

Comments

(0)