From b9634ac776c24bc4d4a57859d884a94cdfe16043 Mon Sep 17 00:00:00 2001
From: philg314 <110174000+philg314@users.noreply.github.com>
Date: Thu, 8 Sep 2022 13:12:14 +0200
Subject: gh-96352: Set AttributeError context in
 _PyObject_GenericGetAttrWithDict (#96353)

---
 Lib/test/test_exceptions.py                                          | 5 +++++
 .../Core and Builtins/2022-08-28-10-51-19.gh-issue-96352.jTLD2d.rst  | 2 ++
 Objects/object.c                                                     | 2 ++
 3 files changed, 9 insertions(+)
 create mode 100644 Misc/NEWS.d/next/Core and Builtins/2022-08-28-10-51-19.gh-issue-96352.jTLD2d.rst

diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py
index f8b0512..123bed6 100644
--- a/Lib/test/test_exceptions.py
+++ b/Lib/test/test_exceptions.py
@@ -2099,6 +2099,11 @@ class AttributeErrorTests(unittest.TestCase):
         except AttributeError as exc:
             self.assertEqual("bluch", exc.name)
             self.assertEqual(obj, exc.obj)
+        try:
+            object.__getattribute__(obj, "bluch")
+        except AttributeError as exc:
+            self.assertEqual("bluch", exc.name)
+            self.assertEqual(obj, exc.obj)
 
     def test_getattr_has_name_and_obj_for_method(self):
         class A:
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-08-28-10-51-19.gh-issue-96352.jTLD2d.rst b/Misc/NEWS.d/next/Core and Builtins/2022-08-28-10-51-19.gh-issue-96352.jTLD2d.rst
new file mode 100644
index 0000000..25ab967
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-08-28-10-51-19.gh-issue-96352.jTLD2d.rst	
@@ -0,0 +1,2 @@
+Fix :exc:`AttributeError` missing ``name`` and ``obj`` attributes in
+:meth:`object.__getattribute__`. Patch by Philip Georgi.
diff --git a/Objects/object.c b/Objects/object.c
index 69f7834..26cdcef 100644
--- a/Objects/object.c
+++ b/Objects/object.c
@@ -1351,6 +1351,8 @@ _PyObject_GenericGetAttrWithDict(PyObject *obj, PyObject *name,
         PyErr_Format(PyExc_AttributeError,
                      "'%.50s' object has no attribute '%U'",
                      tp->tp_name, name);
+
+        set_attribute_error_context(obj, name);
     }
   done:
     Py_XDECREF(descr);
-- 
cgit v0.12