Commitb387e9e

committed

Merge branch 'master' into soft-shutdown

2 parents8e3c028 +d145ab1 commitb387e9eCopy full SHA for b387e9e

File tree

+14

-0

lines changed

+14

-0

lines changed

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,5 +17,17 @@ public void CanDisposeMultipleTimes()`
`17`	`17`	`gilState.Dispose();`
`18`	`18`	`}`
`19`	`19`	`}`
	`20`	`+`
	`21`	`+[OneTimeSetUp]`
	`22`	`+publicvoidSetUp()`
	`23`	`+{`
	`24`	`+PythonEngine.Initialize();`
	`25`	`+}`
	`26`	`+`
	`27`	`+[OneTimeTearDown]`
	`28`	`+publicvoidDispose()`
	`29`	`+{`
	`30`	`+PythonEngine.Shutdown();`
	`31`	`+}`
`20`	`32`	`}`
`21`	`33`	`}`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,7 @@ public bool TryDecode<T>(PyObject pyObj, out T value)`
`81`	`81`	`IntPtrpyItem=Runtime.PyTuple_GetItem(pyObj.Handle,itemIndex);`
`82`	`82`	`if(!Converter.ToManaged(pyItem,itemTypes[itemIndex],outelements[itemIndex],setError:false))`
`83`	`83`	`{`
	`84`	`+Exceptions.Clear();`
`84`	`85`	`returnfalse;`
`85`	`86`	`}`
`86`	`87`	`}`
`@@ -105,6 +106,7 @@ static bool Decode(PyObject tuple, out object value)`
`105`	`106`	`varpyItem=Runtime.PyTuple_GetItem(tuple.Handle,itemIndex);`
`106`	`107`	`if(!Converter.ToManaged(pyItem,typeof(object),outelements[itemIndex],setError:false))`
`107`	`108`	`{`
	`109`	`+Exceptions.Clear();`
`108`	`110`	`returnfalse;`
`109`	`111`	`}`
`110`	`112`

Comments

(0)