fix issues

koubaa · koubaa · commit 8283507023e2 · 2020-04-12T15:22:46.000-05:00
diff --git a/src/FunctionCodec.cs b/src/FunctionCodec.cs
@@ -95,10 +95,9 @@ private static object ConvertVariadicObjectAction(PyObject pyObj, int numArgs)
         //TODO share code between ConvertUnaryFunc and ConvertVariadicObjectFunc
         private static object ConvertUnaryFunc(PyObject pyObj)
         {
+            var pyAction = new PyObject(pyObj.Handle);
             Func<object> func = () =>
             {
-                //Runtime.XIncref(pyObj.Handle);
-                PyObject pyAction = new PyObject(pyObj.Handle);
                 var pyArgs = new PyObject[0];
                 using (Py.GIL())
                 {
@@ -111,10 +110,9 @@ private static object ConvertUnaryFunc(PyObject pyObj)
 
         private static object ConvertVariadicObjectFunc(PyObject pyObj, int numArgs)
         {
+            var pyAction = new PyObject(pyObj.Handle);
             Func<object[], object> func = (object[] o) =>
             {
-                //Runtime.XIncref(pyObj.Handle);
-                PyObject pyAction = new PyObject(pyObj.Handle);
                 var pyArgs = new PyObject[numArgs];
                 int i = 0;
                 foreach (object obj in o)
diff --git a/tests/FunctionCodecTests.cs b/tests/FunctionCodecTests.cs
@@ -1,8 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using NUnit.Framework;
-using Python.Runtime.Codecs;
 
 namespace Python.Runtime.Codecs
 {
diff --git a/tests/TestCallbacks.cs b/tests/TestCallbacks.cs
@@ -1,12 +1,8 @@
 using System;
-
 using NUnit.Framework;
-using Python.Runtime;
 
-namespace Python.EmbeddingTest
+namespace Python.Runtime.Codecs
 {
-    using Runtime = Python.Runtime.Runtime;
-
     public class TestCallbacks
     {
         [OneTimeSetUp]
@@ -60,7 +56,7 @@ def str_len(a):
 
             var callables = new Callables();
 
-            Python.Runtime.Codecs.FunctionCodec.Register();
+            FunctionCodec.Register();
 
             //ret1.  A function with no arguments that returns an integer
             //it must be convertible to Action or Func<object> and not to Func<object, object>
@@ -81,8 +77,8 @@ def str_len(a):
             {
                 Action<object[]> result3 = null;
                 Func<object[], object> result4 = null;
-                Assert.DoesNotThrow(() => { result3 = ret1.As<Action<object[]>>(); });
-                Assert.DoesNotThrow(() => { result4 = ret1.As<Func<object[], object>>(); });
+                Assert.DoesNotThrow(() => { result3 = strLen.As<Action<object[]>>(); });
+                Assert.DoesNotThrow(() => { result4 = strLen.As<Func<object[], object>>(); });
 
                 //try using both func and action to show you can get __len__ of a string but not an integer
                 Assert.Throws<PythonException>(() => { callables.CallAction1((Action<object[]>)result3, 2); });

Original file line number	Diff line number	Diff line change
`@@ -95,10 +95,9 @@ private static object ConvertVariadicObjectAction(PyObject pyObj, int numArgs)`
`95`	`95`	`//TODO share code between ConvertUnaryFunc and ConvertVariadicObjectFunc`
`96`	`96`	`private static object ConvertUnaryFunc(PyObject pyObj)`
`97`	`97`	`{`
	`98`	`+ var pyAction = new PyObject(pyObj.Handle);`
`98`	`99`	`Func<object> func = () =>`
`99`	`100`	`{`
`100`		`- //Runtime.XIncref(pyObj.Handle);`
`101`		`- PyObject pyAction = new PyObject(pyObj.Handle);`
`102`	`101`	`var pyArgs = new PyObject[0];`
`103`	`102`	`using (Py.GIL())`
`104`	`103`	`{`
`@@ -111,10 +110,9 @@ private static object ConvertUnaryFunc(PyObject pyObj)`
`111`	`110`
`112`	`111`	`private static object ConvertVariadicObjectFunc(PyObject pyObj, int numArgs)`
`113`	`112`	`{`
	`113`	`+ var pyAction = new PyObject(pyObj.Handle);`
`114`	`114`	`Func<object[], object> func = (object[] o) =>`
`115`	`115`	`{`
`116`		`- //Runtime.XIncref(pyObj.Handle);`
`117`		`- PyObject pyAction = new PyObject(pyObj.Handle);`
`118`	`116`	`var pyArgs = new PyObject[numArgs];`
`119`	`117`	`int i = 0;`
`120`	`118`	`foreach (object obj in o)`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,5 @@`
`1`	`1`	`using System;`
`2`		`-using System.Collections.Generic;`
`3`		`-using System.Text;`
`4`	`2`	`using NUnit.Framework;`
`5`		`-using Python.Runtime.Codecs;`
`6`	`3`
`7`	`4`	`namespace Python.Runtime.Codecs`
`8`	`5`	`{`