Commitb5ba815

authored

Ensure only implementers of IEnumerable or IEnumerator are considered Iterable (#1241)

Fixes#1234.Previously `tp_iter` slot was set for all reflected .NET types. This restricts it to types, that implement `IEnumerable` or `IEnumerator`

1 parent451fae6 commitb5ba815Copy full SHA for b5ba815

File tree

+26

-0

lines changed

+26

-0

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@`
`28`	`28`	`- Christoph Gohlke ([@cgohlke](https://github.com/cgohlke))`
`29`	`29`	`- Christopher Bremner ([@chrisjbremner](https://github.com/chrisjbremner))`
`30`	`30`	`- Christopher Pow ([@christopherpow](https://github.com/christopherpow))`
	`31`	`+- Daniel Abrahamsson ([@danabr](https://github.com/danabr))`
`31`	`32`	`- Daniel Fernandez ([@fdanny](https://github.com/fdanny))`
`32`	`33`	`- Daniel Santana ([@dgsantana](https://github.com/dgsantana))`
`33`	`34`	`- Dave Hirschfeld ([@dhirschfeld](https://github.com/dhirschfeld))`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ details about the cause of the failure`
`21`	`21`	- Fix incorrect dereference of wrapper object in`tp_repr`, which may result in a program crash
`22`	`22`	`- Fix incorrect dereference in params array handling`
`23`	`23`	- Fix`object[]` parameters taking precedence when should not in overload resolution
	`24`	`+- Fixed a bug where all .NET class instances were considered Iterable`
`24`	`25`
`25`	`26`	`##[2.5.0][] - 2020-06-14`
`26`	`27`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -164,6 +164,13 @@ internal static IntPtr CreateType(ManagedType impl, Type clrType)`
`164`	`164`	`// we want to do this after the slot stuff above in case the class itself implements a slot method`
`165`	`165`	`InitializeSlots(type,impl.GetType());`
`166`	`166`
	`167`	`+if(!clrType.GetInterfaces().Any(ifc=>ifc==typeof(IEnumerable)\|\|ifc==typeof(IEnumerator)))`
	`168`	`+{`
	`169`	`+// The tp_iter slot should only be set for enumerable types.`
	`170`	`+Marshal.WriteIntPtr(type,TypeOffset.tp_iter,IntPtr.Zero);`
	`171`	`+}`
	`172`	`+`
	`173`	`+`
`167`	`174`	`if(base_!=IntPtr.Zero)`
`168`	`175`	`{`
`169`	`176`	`Marshal.WriteIntPtr(type,TypeOffset.tp_base,base_);`

Lines changed: 17 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -172,6 +172,23 @@ def test_ienumerator_iteration():`
`172`	`172`	`foriteminchars:`
`173`	`173`	`assertitemin'test string'`
`174`	`174`
	`175`	`+deftest_iterable():`
	`176`	`+"""Test what objects are Iterable"""`
	`177`	`+fromcollections.abcimportIterable`
	`178`	`+fromPython.TestimportClassTest`
	`179`	`+`
	`180`	`+assertisinstance(System.String.Empty,Iterable)`
	`181`	`+assertisinstance(ClassTest.GetArrayList(),Iterable)`
	`182`	`+assertisinstance(ClassTest.GetEnumerator(),Iterable)`
	`183`	`+assert (notisinstance(ClassTest,Iterable))`
	`184`	`+assert (notisinstance(ClassTest(),Iterable))`
	`185`	`+`
	`186`	`+classShouldBeIterable(ClassTest):`
	`187`	`+def__iter__(self):`
	`188`	`+returniter([])`
	`189`	`+`
	`190`	`+assertisinstance(ShouldBeIterable(),Iterable)`
	`191`	`+`
`175`	`192`
`176`	`193`	`deftest_override_get_item():`
`177`	`194`	`"""Test managed subclass overriding __getitem__."""`

Comments

(0)