ClassDerivedObject: python values converted to .NET must not be disposed

lostmsu · lostmsu · commit ab6b69a4f000 · 2021-03-30T20:47:52.000-07:00
diff --git a/src/runtime/classderived.cs b/src/runtime/classderived.cs
@@ -671,7 +671,6 @@ public static T InvokeMethod<T>(IPythonDerivedType obj, string methodName, strin
                             }
 
                             PyObject py_result = method.Invoke(pyargs);
-                            disposeList.Add(py_result);
                             return (T)py_result.AsManagedObject(typeof(T));
                         }
                     }
@@ -774,12 +773,10 @@ public static T InvokeGetProperty<T>(IPythonDerivedType obj, string propertyName
             try
             {
                 Runtime.XIncref(self.pyHandle);
-                using (var pyself = new PyObject(self.pyHandle))
-                using (PyObject pyvalue = pyself.GetAttr(propertyName))
-                {
+                using var pyself = new PyObject(self.pyHandle);
+                PyObject pyvalue = pyself.GetAttr(propertyName);
                     return (T)pyvalue.AsManagedObject(typeof(T));
                 }
-            }
             finally
             {
                 Runtime.PyGILState_Release(gs);

Original file line number	Diff line number	Diff line change
`@@ -671,7 +671,6 @@ public static T InvokeMethod<T>(IPythonDerivedType obj, string methodName, strin`
`671`	`671`	`}`
`672`	`672`
`673`	`673`	`PyObject py_result = method.Invoke(pyargs);`
`674`		`- disposeList.Add(py_result);`
`675`	`674`	`return (T)py_result.AsManagedObject(typeof(T));`
`676`	`675`	`}`
`677`	`676`	`}`
`@@ -774,12 +773,10 @@ public static T InvokeGetProperty<T>(IPythonDerivedType obj, string propertyName`
`774`	`773`	`try`
`775`	`774`	`{`
`776`	`775`	`Runtime.XIncref(self.pyHandle);`
`777`		`- using (var pyself = new PyObject(self.pyHandle))`
`778`		`- using (PyObject pyvalue = pyself.GetAttr(propertyName))`
`779`		`- {`
	`776`	`+ using var pyself = new PyObject(self.pyHandle);`
	`777`	`+ PyObject pyvalue = pyself.GetAttr(propertyName);`
`780`	`778`	`return (T)pyvalue.AsManagedObject(typeof(T));`
`781`	`779`	`}`
`782`		`- }`
`783`	`780`	`finally`
`784`	`781`	`{`
`785`	`782`	`Runtime.PyGILState_Release(gs);`