Commitc79be84

authored and

committed

Make it possible to use inherited indexers

If a class A had indexer, and class B derived from it, Python.NET wouldnot consider class B to have any indexer.

1 parentf808166 commitc79be84Copy full SHA for c79be84

File tree

+77

-0

lines changed

+77

-0

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ details about the cause of the failure`
`30`	`30`	`- Fix incorrect choice of method to invoke when using keyword arguments.`
`31`	`31`	`- Fix non-delegate types incorrectly appearing as callable.`
`32`	`32`	`- Indexers can now be used with interface objects`
	`33`	`+- Fixed a bug where indexers could not be used if they were inherited`
`33`	`34`
`34`	`35`	`##[2.5.0][] - 2020-06-14`
`35`	`36`

Lines changed: 19 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -389,6 +389,25 @@ private static ClassInfo GetClassInfo(Type type)`
`389`	`389`	`ci.members[name]=ob;`
`390`	`390`	`}`
`391`	`391`
	`392`	`+if(ci.indexer==null&&type.IsClass)`
	`393`	`+{`
	`394`	`+// Indexer may be inherited.`
	`395`	`+varparent=type.BaseType;`
	`396`	`+while(parent!=null&&ci.indexer==null)`
	`397`	`+{`
	`398`	`+foreach(varpropinparent.GetProperties()){`
	`399`	`+varargs=prop.GetIndexParameters();`
	`400`	`+if(args.GetLength(0)>0)`
	`401`	`+{`
	`402`	`+ci.indexer=newIndexer();`
	`403`	`+ci.indexer.AddProperty(prop);`
	`404`	`+break;`
	`405`	`+}`
	`406`	`+}`
	`407`	`+parent=parent.BaseType;`
	`408`	`+}`
	`409`	`+}`
	`410`	`+`
`392`	`411`	`returnci;`
`393`	`412`	`}`
`394`	`413`	`}`

Lines changed: 25 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -411,4 +411,29 @@ public MultiDefaultKeyIndexerTest() : base()`
`411`	`411`	`}`
`412`	`412`	`}`
`413`	`413`	`}`
	`414`	`+`
	`415`	`+publicclassPublicInheritedIndexerTest:PublicIndexerTest{}`
	`416`	`+`
	`417`	`+publicclassProtectedInheritedIndexerTest:ProtectedIndexerTest{}`
	`418`	`+`
	`419`	`+publicclassPrivateInheritedIndexerTest:ProtectedIndexerTest{}`
	`420`	`+`
	`421`	`+publicclassInternalInheritedIndexerTest:InternalIndexerTest{}`
	`422`	`+`
	`423`	`+publicinterfaceIIndexer`
	`424`	`+{`
	`425`	`+stringthis[intindex]{get;set;}`
	`426`	`+}`
	`427`	`+`
	`428`	`+publicinterfaceIInheritedIndexer:IIndexer{}`
	`429`	`+`
	`430`	`+publicclassInterfaceInheritedIndexerTest:IndexerBase,IInheritedIndexer{`
	`431`	`+privateSystem.Collections.Generic.IDictionary<int,string>d=newSystem.Collections.Generic.Dictionary<int,string>();`
	`432`	`+`
	`433`	`+publicstringthis[intindex]`
	`434`	`+{`
	`435`	`+get{returnGetValue(index);}`
	`436`	`+set{t[index]=value;}`
	`437`	`+}`
	`438`	`+}`
`414`	`439`	`}`

Lines changed: 32 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -614,3 +614,35 @@ def test_using_indexer_on_object_without_indexer():`
`614`	`614`
`615`	`615`	`withpytest.raises(TypeError):`
`616`	`616`	`o[0]=1`
	`617`	`+`
	`618`	`+`
	`619`	`+deftest_inherited_indexer():`
	`620`	`+"""Test that inherited indexers are accessible"""`
	`621`	`+fromPython.TestimportPublicInheritedIndexerTest`
	`622`	`+fromPython.TestimportProtectedInheritedIndexerTest`
	`623`	`+fromPython.TestimportPrivateInheritedIndexerTest`
	`624`	`+fromPython.TestimportInternalInheritedIndexerTest`
	`625`	`+`
	`626`	`+pub=PublicInheritedIndexerTest()`
	`627`	`+pub[0]="zero"`
	`628`	`+assertpub[0]=="zero"`
	`629`	`+`
	`630`	`+defassert_no_indexer(obj):`
	`631`	`+withpytest.raises(TypeError):`
	`632`	`+obj[0]`
	`633`	`+withpytest.raises(TypeError):`
	`634`	`+obj[0]="zero"`
	`635`	`+`
	`636`	`+assert_no_indexer(PrivateInheritedIndexerTest)`
	`637`	`+assert_no_indexer(ProtectedInheritedIndexerTest)`
	`638`	`+assert_no_indexer(InternalInheritedIndexerTest)`
	`639`	`+`
	`640`	`+`
	`641`	`+deftest_inherited_indexer_interface():`
	`642`	`+"""Test that indexers inherited from other interfaces are accessible"""`
	`643`	`+fromPython.TestimportInterfaceInheritedIndexerTest,IInheritedIndexer`
	`644`	`+`
	`645`	`+impl=InterfaceInheritedIndexerTest()`
	`646`	`+ifc=IInheritedIndexer(impl)`
	`647`	`+ifc[0]="zero"`
	`648`	`+assertifc[0]=="zero"`

Comments

(0)