Commit03cf4ac

authored

Non-delegate types should not be callable (#1247)

Removed the ClassObject.tp_call method which seemed to be unused. Also added a test case.

1 parent50d947f commit03cf4acCopy full SHA for 03cf4ac

File tree

+12

-31

lines changed

+12

-31

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -77,3 +77,4 @@`
`77`	`77`	`- ([@stonebig](https://github.com/stonebig))`
`78`	`78`	`- ([@testrunner123](https://github.com/testrunner123))`
`79`	`79`	`- ([@DanBarzilian](https://github.com/DanBarzilian))`
	`80`	`+- ([@alxnull](https://github.com/alxnull))`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ details about the cause of the failure`
`28`	`28`	- Fix`object[]` parameters taking precedence when should not in overload resolution
`29`	`29`	`- Fixed a bug where all .NET class instances were considered Iterable`
`30`	`30`	`- Fix incorrect choice of method to invoke when using keyword arguments.`
	`31`	`+- Fix non-delegate types incorrectly appearing as callable.`
`31`	`32`
`32`	`33`	`##[2.5.0][] - 2020-06-14`
`33`	`34`

Lines changed: 0 additions & 31 deletions

Original file line number	Diff line number	Diff line change
`@@ -278,36 +278,5 @@ public static int mp_ass_subscript(IntPtr ob, IntPtr idx, IntPtr v)`
`278`	`278`
`279`	`279`	`return0;`
`280`	`280`	`}`
`281`		`-`
`282`		`-`
`283`		`-/// <summary>`
`284`		`-/// This is a hack. Generally, no managed class is considered callable`
`285`		`-/// from Python - with the exception of System.Delegate. It is useful`
`286`		`-/// to be able to call a System.Delegate instance directly, especially`
`287`		`-/// when working with multicast delegates.`
`288`		`-/// </summary>`
`289`		`-publicstaticIntPtrtp_call(IntPtrob,IntPtrargs,IntPtrkw)`
`290`		`-{`
`291`		`-//ManagedType self = GetManagedObject(ob);`
`292`		`-IntPtrtp=Runtime.PyObject_TYPE(ob);`
`293`		`-varcb=(ClassBase)GetManagedObject(tp);`
`294`		`-`
`295`		`-if(cb.type!=typeof(Delegate))`
`296`		`-{`
`297`		`-Exceptions.SetError(Exceptions.TypeError,"object is not callable");`
`298`		`-returnIntPtr.Zero;`
`299`		`-}`
`300`		`-`
`301`		`-varco=(CLRObject)GetManagedObject(ob);`
`302`		`-vard=co.instasDelegate;`
`303`		`-BindingFlagsflags=BindingFlags.Public\|`
`304`		`-BindingFlags.NonPublic\|`
`305`		`-BindingFlags.Instance\|`
`306`		`-BindingFlags.Static;`
`307`		`-`
`308`		`-MethodInfomethod=d.GetType().GetMethod("Invoke",flags);`
`309`		`-varbinder=newMethodBinder(method);`
`310`		`-returnbinder.Invoke(ob,args,kw);`
`311`		`-}`
`312`	`281`	`}`
`313`	`282`	`}`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -315,3 +315,13 @@ def test_method_inheritance():`
`315`	`315`
`316`	`316`	`assertbase.IsBase()==True`
`317`	`317`	`assertderived.IsBase()==False`
	`318`	`+`
	`319`	`+`
	`320`	`+deftest_callable():`
	`321`	`+"""Test that only delegate subtypes are callable"""`
	`322`	`+`
	`323`	`+deffoo():`
	`324`	`+pass`
	`325`	`+`
	`326`	`+assertcallable(System.String("foo"))==False`
	`327`	`+assertcallable(System.Action(foo))==True`

Comments

(0)