Commit107c8b9

authored and

committed

PyObject.AsManagedObject gives a better error message

DelegateManager.TrueDispatch gives a better error message

1 parentcac82a6 commit107c8b9Copy full SHA for 107c8b9

File tree

+37

-29

lines changed

+37

-29

lines changed

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -59,9 +59,17 @@ def add(self, x, y):`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`[Test]`
`62`		`-publicvoidInvokeNull(){`
	`62`	`+publicvoidInvokeNull()`
	`63`	`+{`
`63`	`64`	`varlist=PythonEngine.Eval("list");`
`64`	`65`	`Assert.Throws<ArgumentNullException>(()=>list.Invoke(newPyObject[]{null}));`
`65`	`66`	`}`
	`67`	`+`
	`68`	`+[Test]`
	`69`	`+publicvoidAsManagedObjectInvalidCast()`
	`70`	`+{`
	`71`	`+varlist=PythonEngine.Eval("list");`
	`72`	`+Assert.Throws<InvalidCastException>(()=>list.AsManagedObject(typeof(int)));`
	`73`	`+}`
`66`	`74`	`}`
`67`	`75`	`}`

Lines changed: 5 additions & 19 deletions

Original file line number	Diff line number	Diff line change
`@@ -221,19 +221,17 @@ public void Dispose()`
`221`	`221`	`publicobjectDispatch(ArrayListargs)`
`222`	`222`	`{`
`223`	`223`	`IntPtrgs=PythonEngine.AcquireLock();`
`224`		`-objectob=null;`
	`224`	`+objectob;`
`225`	`225`
`226`	`226`	`try`
`227`	`227`	`{`
`228`	`228`	`ob=TrueDispatch(args);`
`229`	`229`	`}`
`230`		`-catch(Exceptione)`
	`230`	`+finally`
`231`	`231`	`{`
`232`	`232`	`PythonEngine.ReleaseLock(gs);`
`233`		`-throwe;`
`234`	`233`	`}`
`235`	`234`
`236`		`-PythonEngine.ReleaseLock(gs);`
`237`	`235`	`returnob;`
`238`	`236`	`}`
`239`	`237`
`@@ -266,27 +264,15 @@ public object TrueDispatch(ArrayList args)`
`266`	`264`	`returnnull;`
`267`	`265`	`}`
`268`	`266`
`269`		`-objectresult=null;`
`270`		`-if(!Converter.ToManaged(op,rtype,outresult,false))`
	`267`	`+objectresult;`
	`268`	`+if(!Converter.ToManaged(op,rtype,outresult,true))`
`271`	`269`	`{`
`272`	`270`	`Runtime.XDecref(op);`
`273`		`-thrownewConversionException($"could not convert Python result to{rtype}");`
	`271`	`+thrownewPythonException();`
`274`	`272`	`}`
`275`	`273`
`276`	`274`	`Runtime.XDecref(op);`
`277`	`275`	`returnresult;`
`278`	`276`	`}`
`279`	`277`	`}`
`280`		`-`
`281`		`-`
`282`		`-publicclassConversionException:Exception`
`283`		`-{`
`284`		`-publicConversionException()`
`285`		`-{`
`286`		`-}`
`287`		`-`
`288`		`-publicConversionException(stringmsg):base(msg)`
`289`		`-{`
`290`		`-}`
`291`		`-}`
`292`	`278`	`}`

Lines changed: 3 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -134,9 +134,9 @@ public static PyObject FromManagedObject(object ob)`
`134`	`134`	`publicobjectAsManagedObject(Typet)`
`135`	`135`	`{`
`136`	`136`	`objectresult;`
`137`		`-if(!Converter.ToManaged(obj,t,outresult,false))`
	`137`	`+if(!Converter.ToManaged(obj,t,outresult,true))`
`138`	`138`	`{`
`139`		`-thrownewInvalidCastException("cannot convert object to target type");`
	`139`	`+thrownewInvalidCastException("cannot convert object to target type",newPythonException());`
`140`	`140`	`}`
`141`	`141`	`returnresult;`
`142`	`142`	`}`
`@@ -154,12 +154,7 @@ public T As<T>()`
`154`	`154`	`{`
`155`	`155`	`return(T)(thisasobject);`
`156`	`156`	`}`
`157`		`-objectresult;`
`158`		`-if(!Converter.ToManaged(obj,typeof(T),outresult,false))`
`159`		`-{`
`160`		`-thrownewInvalidCastException("cannot convert object to target type");`
`161`		`-}`
`162`		`-return(T)result;`
	`157`	`+return(T)AsManagedObject(typeof(T));`
`163`	`158`	`}`
`164`	`159`
`165`	`160`

Lines changed: 20 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`# -- coding: utf-8 --`
`2`		`-# TODO: Add test for ObjectDelegate`
`3`	`2`
`4`	`3`	`"""Test CLR delegate support."""`
`5`	`4`
`@@ -257,6 +256,26 @@ def always_so_negative():`
`257`	`256`	`assertnotd()`
`258`	`257`	`assertnotob.CallBoolDelegate(d)`
`259`	`258`
	`259`	`+deftest_object_delegate():`
	`260`	`+"""Test object delegate."""`
	`261`	`+fromPython.TestimportObjectDelegate`
	`262`	`+`
	`263`	`+defcreate_object():`
	`264`	`+returnDelegateTest()`
	`265`	`+`
	`266`	`+d=ObjectDelegate(create_object)`
	`267`	`+ob=DelegateTest()`
	`268`	`+ob.CallObjectDelegate(d)`
	`269`	`+`
	`270`	`+deftest_invalid_object_delegate():`
	`271`	`+"""Test invalid object delegate with mismatched return type."""`
	`272`	`+fromPython.TestimportObjectDelegate`
	`273`	`+`
	`274`	`+d=ObjectDelegate(hello_func)`
	`275`	`+ob=DelegateTest()`
	`276`	`+withpytest.raises(TypeError):`
	`277`	`+ob.CallObjectDelegate(d)`
	`278`	`+`
`260`	`279`	`# test async delegates`
`261`	`280`
`262`	`281`	`# test multicast delegates`

Comments

(0)