Commit1391639

authored

Merge pull request#1486 from losttech/bugs/PythonInheritsDotNet_DoubleTypeReady

Fixed double call to `PyType_Ready` in CLR MetaType's `tp_new`

2 parentsd300111 +c1e5622 commit1391639Copy full SHA for 1391639

File tree

-3

lines changed

-3

lines changed

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,9 @@ public static IntPtr tp_new(IntPtr tp, IntPtr args, IntPtr kw)`
`145`	`145`	`returnIntPtr.Zero;`
`146`	`146`	`}`
`147`	`147`
`148`		`-varflags=TypeFlags.Default;`
	`148`	`+varflags=(TypeFlags)Util.ReadCLong(type,TypeOffset.tp_flags);`
	`149`	`+if(!flags.HasFlag(TypeFlags.Ready))`
	`150`	`+thrownewNotSupportedException("PyType.tp_new returned an incomplete type");`
`149`	`151`	`flags\|=TypeFlags.HasClrInstance;`
`150`	`152`	`flags\|=TypeFlags.HeapType;`
`151`	`153`	`flags\|=TypeFlags.BaseType;`
`@@ -170,8 +172,7 @@ public static IntPtr tp_new(IntPtr tp, IntPtr args, IntPtr kw)`
`170`	`172`	`IntPtrgc=Marshal.ReadIntPtr(base_type,Offsets.tp_clr_inst);`
`171`	`173`	`Marshal.WriteIntPtr(type,Offsets.tp_clr_inst,gc);`
`172`	`174`
`173`		`-if(Runtime.PyType_Ready(type)!=0)`
`174`		`-throwPythonException.ThrowLastAsClrException();`
	`175`	`+Runtime.PyType_Modified(newBorrowedReference(type));`
`175`	`176`
`176`	`177`	`returntype;`
`177`	`178`	`}`

Comments

(0)