[3.10] bpo-46940: Don't override existing AttributeError suggestion information (GH-31710) (GH-31724)

When an exception is created in a nested call to PyObject_GetAttr, any
external calls will override the context information of the
AttributeError that we have already placed in the most internal call.
This will cause the suggestions we create to nor work properly as the
attribute name and object that we will be using are the incorrect ones.

To avoid this, we need to check first if these attributes are already
set and bail out if that's the case..
(cherry picked from commit 3b3be05a16)

Co-authored-by: Pablo Galindo Salgado <Pablogsal@gmail.com>
This commit is contained in:
Pablo Galindo Salgado 2022-03-07 13:18:36 +00:00 committed by GitHub
parent 8acbb93c07
commit 3594ebca2c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 48 additions and 15 deletions

View file

@ -2201,6 +2201,24 @@ class AttributeErrorTests(unittest.TestCase):
self.assertNotIn("?", err.getvalue())
def test_attribute_error_inside_nested_getattr(self):
class A:
bluch = 1
class B:
def __getattribute__(self, attr):
a = A()
return a.blich
try:
B().something
except AttributeError as exc:
with support.captured_stderr() as err:
sys.__excepthook__(*sys.exc_info())
self.assertIn("Did you mean", err.getvalue())
self.assertIn("bluch", err.getvalue())
class ImportErrorTests(unittest.TestCase):