Fix warning regarding undefined __module__ on GC Offset Base

filmor · lostmsu · commit dfeb354de6c3 · 2021-12-23T15:37:33.000-08:00
Also makes the type names a bit more Python-esque. The `clr._internal`
module doesn't exist, but that is no difference to the previous setup.
diff --git a/src/runtime/typemanager.cs b/src/runtime/typemanager.cs
@@ -456,7 +456,7 @@ internal static PyType CreateMetatypeWithGCHandleOffset()
             int size = Util.ReadInt32(Runtime.PyTypeType, TypeOffset.tp_basicsize)
                        + IntPtr.Size // tp_clr_inst_offset
             ;
-            var result = new PyType(new TypeSpec("GC Offset Base", basicSize: size,
+            var result = new PyType(new TypeSpec("clr._internal.GCOffsetBase", basicSize: size,
                 new TypeSpec.Slot[]
                 {
 
@@ -480,7 +480,7 @@ internal static PyType CreateMetaType(Type impl, out SlotsHolder slotsHolder)
 
             PyType gcOffsetBase = CreateMetatypeWithGCHandleOffset();
 
-            PyType type = AllocateTypeObject("CLR Metatype", metatype: gcOffsetBase);
+            PyType type = AllocateTypeObject("CLRMetatype", metatype: gcOffsetBase);
 
             Util.WriteRef(type, TypeOffset.tp_base, new NewReference(gcOffsetBase).Steal());
 
@@ -509,7 +509,7 @@ internal static PyType CreateMetaType(Type impl, out SlotsHolder slotsHolder)
             }
             
             BorrowedReference dict = Util.ReadRef(type, TypeOffset.tp_dict);
-            using (var mod = Runtime.PyString_FromString("CLR"))
+            using (var mod = Runtime.PyString_FromString("clr._internal"))
                 Runtime.PyDict_SetItemString(dict, "__module__", mod.Borrow());
 
             // The type has been modified after PyType_Ready has been called
diff --git a/tests/utils.py b/tests/utils.py
@@ -24,7 +24,7 @@ def is_clr_root_module(ob):
 
 
 def is_clr_class(ob):
-    return type(ob).__name__ == 'CLR Metatype'  # for now
+    return type(ob).__name__ == 'CLRMetatype' and type(ob).__module__ == 'clr._internal'  # for now
 
 
 class ClassicClass:

Original file line number	Diff line number	Diff line change
`@@ -456,7 +456,7 @@ internal static PyType CreateMetatypeWithGCHandleOffset()`
`456`	`456`	`int size = Util.ReadInt32(Runtime.PyTypeType, TypeOffset.tp_basicsize)`
`457`	`457`	`+ IntPtr.Size // tp_clr_inst_offset`
`458`	`458`	`;`
`459`		`- var result = new PyType(new TypeSpec("GC Offset Base", basicSize: size,`
	`459`	`+ var result = new PyType(new TypeSpec("clr._internal.GCOffsetBase", basicSize: size,`
`460`	`460`	`new TypeSpec.Slot[]`
`461`	`461`	`{`
`462`	`462`
`@@ -480,7 +480,7 @@ internal static PyType CreateMetaType(Type impl, out SlotsHolder slotsHolder)`
`480`	`480`
`481`	`481`	`PyType gcOffsetBase = CreateMetatypeWithGCHandleOffset();`
`482`	`482`
`483`		`- PyType type = AllocateTypeObject("CLR Metatype", metatype: gcOffsetBase);`
	`483`	`+ PyType type = AllocateTypeObject("CLRMetatype", metatype: gcOffsetBase);`
`484`	`484`
`485`	`485`	`Util.WriteRef(type, TypeOffset.tp_base, new NewReference(gcOffsetBase).Steal());`
`486`	`486`
`@@ -509,7 +509,7 @@ internal static PyType CreateMetaType(Type impl, out SlotsHolder slotsHolder)`
`509`	`509`	`}`
`510`	`510`
`511`	`511`	`BorrowedReference dict = Util.ReadRef(type, TypeOffset.tp_dict);`
`512`		`- using (var mod = Runtime.PyString_FromString("CLR"))`
	`512`	`+ using (var mod = Runtime.PyString_FromString("clr._internal"))`
`513`	`513`	`Runtime.PyDict_SetItemString(dict, "__module__", mod.Borrow());`
`514`	`514`
`515`	`515`	`// The type has been modified after PyType_Ready has been called`