Fix: Correctly compute qualified name of nested classes.

Author: fangerer

graalpython/com.oracle.graal.python.test/src/tests/test_metaclass.py

@@ -128,3 +128,17 @@ def __init__(self, a, b):
     assert len(global_log) == 4
     assert global_log[2] == ['__call__', MyClass, (1, 2), {}]
     assert global_log[3] == ['MyKlass object', 1, 2]
+    
+
+class A:
+    class B:
+        pass
+
+
+def test_nested_class():
+    assert A.__name__ == "A"
+    assert A.__qualname__ == "A"
+    assert A.__module__ == __name__
+    assert A.B.__name__ == "B"
+    assert A.B.__qualname__ == "A.B"
+    assert A.B.__module__ == __name__

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/TypeBuiltins.java

@@ -29,8 +29,10 @@
 import static com.oracle.graal.python.nodes.SpecialAttributeNames.__BASES__;
 import static com.oracle.graal.python.nodes.SpecialAttributeNames.__CLASS__;
 import static com.oracle.graal.python.nodes.SpecialAttributeNames.__DICT__;
+import static com.oracle.graal.python.nodes.SpecialAttributeNames.__MODULE__;
 import static com.oracle.graal.python.nodes.SpecialAttributeNames.__MRO__;
 import static com.oracle.graal.python.nodes.SpecialAttributeNames.__NAME__;
+import static com.oracle.graal.python.nodes.SpecialAttributeNames.__QUALNAME__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__CALL__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__DELETE__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__GETATTRIBUTE__;
@@ -39,6 +41,7 @@
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__INSTANCECHECK__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__NEW__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__PREPARE__;
+import static com.oracle.graal.python.nodes.SpecialMethodNames.__REPR__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__SET__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__SUBCLASSCHECK__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__SUBCLASSES__;
@@ -62,7 +65,6 @@
 import com.oracle.graal.python.builtins.objects.mappingproxy.PMappingproxy;
 import com.oracle.graal.python.builtins.objects.object.PythonObject;
 import com.oracle.graal.python.builtins.objects.type.TypeBuiltinsFactory.CallNodeFactory;
-import com.oracle.graal.python.nodes.SpecialMethodNames;
 import com.oracle.graal.python.nodes.argument.positional.PositionalArgumentsNode;
 import com.oracle.graal.python.nodes.attributes.LookupAttributeInMRONode;
 import com.oracle.graal.python.nodes.attributes.LookupInheritedAttributeNode;
@@ -101,14 +103,25 @@ protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFa
         return TypeBuiltinsFactory.getFactories();
     }
 
-    @Builtin(name = SpecialMethodNames.__REPR__, fixedNumOfPositionalArgs = 1)
+    @Builtin(name = __REPR__, fixedNumOfPositionalArgs = 1)
     @GenerateNodeFactory
     public abstract static class ReprNode extends PythonUnaryBuiltinNode {
 
         @Specialization
+        public String repr(PythonClass self,
+                        @Cached("create()") ReadAttributeFromObjectNode readModuleNode,
+                        @Cached("create()") ReadAttributeFromObjectNode readQualNameNode) {
+            Object moduleName = readModuleNode.execute(self, __MODULE__);
+            Object qualName = readQualNameNode.execute(self, __QUALNAME__);
+            return concat(moduleName, qualName);
+        }
+
         @TruffleBoundary
-        public String repr(PythonClass self) {
-            return self.toString();
+        private static String concat(Object moduleName, Object qualName) {
+            if (moduleName != PNone.NO_VALUE) {
+                return String.format("<class '%s.%s'>", moduleName, qualName);
+            }
+            return String.format("<class '%s'>", qualName);
         }
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/PythonTreeTranslator.java

@@ -1697,6 +1697,9 @@ private static String calculateQualname(Python3Parser.ClassdefContext ctx) {
                 Python3Parser.FuncdefContext funcdefContext = (Python3Parser.FuncdefContext) parent;
                 stack.push("<locals>");
                 stack.push(funcdefContext.NAME().getText());
+            } else if (parent instanceof Python3Parser.ClassdefContext) {
+                Python3Parser.ClassdefContext classdefContext = (Python3Parser.ClassdefContext) parent;
+                stack.push(classdefContext.NAME().getText());
             }
 
             parent = parent.getParent();