Correctly set '__module__' and '__qualname__' attribute for native types.

Author: fangerer

graalpython/com.oracle.graal.python.cext/src/typeobject.c

@@ -232,10 +232,7 @@ int PyType_Ready(PyTypeObject* cls) {
     PyDict_SetItemString(native_members, "tp_name", polyglot_from_string(cls->tp_name, SRC_CS));
     PyDict_SetItemString(native_members, "tp_doc", polyglot_from_string(cls->tp_doc ? cls->tp_doc : "", SRC_CS));
     PyDict_SetItemString(native_members, "tp_basicsize", PyLong_FromSsize_t(cls->tp_basicsize));
-    const char* lastDot = strrchr(cls->tp_name, '.');
-    if (lastDot) {
-        PyDict_SetItemString(native_members, "__module__", polyglot_from_string(lastDot + 1, SRC_CS));
-    }
+    const char* class_name = cls->tp_name;
     PyTypeObject* javacls = polyglot_invoke(PY_TRUFFLE_CEXT,
                                             "PyType_Ready",
                                             // no conversion of cls here, because we

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/TruffleCextBuiltins.java

@@ -487,18 +487,37 @@ Object run(Object typestruct, PythonClass metaClass, PTuple baseClasses, PDict n
                 bases[i] = (PythonClass) array[i];
             }
 
-            String name = getStringItem(nativeMembers, "tp_name");
+            // 'tp_name' contains the fully-qualified name, i.e., 'module.A.B...'
+            String fqname = getStringItem(nativeMembers, "tp_name");
             String doc = getStringItem(nativeMembers, "tp_doc");
-            String module = getStringItem(nativeMembers, SpecialAttributeNames.__MODULE__);
-            PythonNativeClass cclass = factory().createNativeClassWrapper(typestruct, metaClass, name, bases);
+            // the qualified name (i.e. without module name) like 'A.B...'
+            String qualName = getQualName(fqname);
+            PythonNativeClass cclass = factory().createNativeClassWrapper(typestruct, metaClass, qualName, bases);
             writeNode.execute(cclass, SpecialAttributeNames.__DOC__, doc);
             writeNode.execute(cclass, SpecialAttributeNames.__BASICSIZE__, getLongItem(nativeMembers, "tp_basicsize"));
-            if (module != null) {
-                writeNode.execute(cclass, SpecialAttributeNames.__MODULE__, module);
+            String moduleName = getModuleName(fqname);
+            if (moduleName != null) {
+                writeNode.execute(cclass, SpecialAttributeNames.__MODULE__, moduleName);
             }
             return new PythonClassInitNativeWrapper(cclass);
         }
 
+        private static String getQualName(String fqname) {
+            int firstDot = fqname.indexOf('.');
+            if (firstDot != -1) {
+                return fqname.substring(firstDot + 1);
+            }
+            return fqname;
+        }
+
+        private static String getModuleName(String fqname) {
+            int firstDotIdx = fqname.indexOf('.');
+            if (firstDotIdx != -1) {
+                return fqname.substring(0, firstDotIdx);
+            }
+            return null;
+        }
+
         private String getStringItem(PDict nativeMembers, String key) {
             Object item = getGetItemNode().execute(nativeMembers.getDictStorage(), key);
             if (item instanceof PString) {