Commitb17b9d3

committed

Set __classcell__ if it exists

If `PyCell_Set` is not called with a cell it will raise an exception,which is perfectly valid here.

1 parentd4eac3a commitb17b9d3Copy full SHA for b17b9d3

File tree

+17

-0

lines changed

+17

-0

lines changed

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1966,6 +1966,15 @@ internal static IntPtr PyMem_Realloc(IntPtr ptr, long size)`
`1966`	`1966`	`[DllImport(_PythonDll, CallingConvention= CallingConvention.Cdecl)]`
`1967`	`1967`	`internalstaticexternvoid PyErr_Print();`
`1968`	`1968`
	`1969`	`+//====================================================================`
	`1970`	`+// Cell API`
	`1971`	`+//====================================================================`
	`1972`	`+`
	`1973`	`+[DllImport(_PythonDll, CallingConvention= CallingConvention.Cdecl)]`
	`1974`	`+ internalstaticextern NewReference PyCell_Get(IntPtr cell);`
	`1975`	`+`
	`1976`	`+[DllImport(_PythonDll, CallingConvention= CallingConvention.Cdecl)]`
	`1977`	`+ internalstaticexternint PyCell_Set(IntPtr cell, IntPtr value);`
`1969`	`1978`
`1970`	`1979`	`//====================================================================`
`1971`	`1980`	`// Miscellaneous`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -280,6 +280,14 @@ internal static IntPtr CreateSubType(IntPtr py_name, IntPtr py_base_type, IntPtr`
`280`	`280`	`IntPtrcls_dict=Marshal.ReadIntPtr(py_type,TypeOffset.tp_dict);`
`281`	`281`	`Runtime.PyDict_Update(cls_dict,py_dict);`
`282`	`282`
	`283`	`+// Update the __classcell__ if it exists`
	`284`	`+IntPtrcell=Runtime.PyDict_GetItemString(cls_dict,"__classcell__");`
	`285`	`+if(cell!=IntPtr.Zero)`
	`286`	`+{`
	`287`	`+Runtime.PyCell_Set(cell,py_type);`
	`288`	`+Runtime.PyDict_DelItemString(cls_dict,"__classcell__");`
	`289`	`+}`
	`290`	`+`
`283`	`291`	`returnpy_type;`
`284`	`292`	`}`
`285`	`293`	`catch(Exceptione)`

Comments

(0)