Fix AttributeError message for types

Author: msimacek

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2024, 2026, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # The Universal Permissive License (UPL), Version 1.0
@@ -77,3 +77,30 @@ def __eq__(self, other):
     o = ObjWithHashSlot()
     o.__hash__ = lambda: 1
     assert hash(o) == 1
+
+
+def test_attribute_error_message():
+    obj = object()
+
+    try:
+        obj.foo
+    except AttributeError as e:
+        assert e.obj == obj
+        assert e.name == "foo"
+        assert str(e) == "'object' object has no attribute 'foo'"
+
+    try:
+        obj.foo = 1
+    except AttributeError as e:
+        # Note: as of 3.12, CPython doesn't set obj and name
+        assert str(e) == "'object' object has no attribute 'foo'"
+
+    class MyClass:
+        pass
+
+    try:
+        MyClass.foo
+    except AttributeError as e:
+        assert e.obj == MyClass
+        assert e.name == "foo"
+        assert str(e) == "type object 'MyClass' has no attribute 'foo'"

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/ErrorMessages.java

@@ -355,7 +355,7 @@ public abstract class ErrorMessages {
     public static final TruffleString GOT_UNEXPECTED_KEYWORD_ARG = tsLiteral("%s() got an unexpected keyword argument '%s'");
     public static final TruffleString HANDLER_MUST_BE_CALLABLE = tsLiteral("handler must be callable");
     public static final TruffleString HAS_NO_ATTR = tsLiteral("%p has no attribute '%s'");
-    public static final TruffleString TYPE_N_HAS_NO_ATTR = tsLiteral("type object %s has no attribute '%s'");
+    public static final TruffleString TYPE_N_HAS_NO_ATTR = tsLiteral("type object '%N' has no attribute '%s'");
     public static final TruffleString P_HAS_NO_ATTRS_S_TO_ASSIGN = tsLiteral("'%p' object has no attributes (assign to .%s)");
     public static final TruffleString P_HAS_NO_ATTRS_S_TO_DELETE = tsLiteral("'%p' object has no attributes (del .%s)");
     public static final TruffleString P_HAS_RO_ATTRS_S_TO_ASSIGN = tsLiteral("'%p' object has only read-only attributes (assign to .%s)");

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/attributes/MergedObjectTypeModuleGetAttributeNode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -181,7 +181,8 @@ static Object doIt(VirtualFrame frame, Node inliningTarget, Object object, Truff
                 }
             }
 
-            throw raiseNode.raiseAttributeError(inliningTarget, ErrorMessages.OBJ_P_HAS_NO_ATTR_S, object, key);
+            TruffleString errorMessage = cachedSlot != TypeBuiltins.SLOTS.tp_getattro() ? ErrorMessages.OBJ_P_HAS_NO_ATTR_S : ErrorMessages.TYPE_N_HAS_NO_ATTR;
+            throw raiseNode.raiseAttributeError(inliningTarget, errorMessage, object, key);
         } catch (PException e) {
             // Extra behavior for module.__getattribute__
             if (cachedSlot == ModuleBuiltins.SLOTS.tp_getattro()) {