Simplify and add more tests

Author: pablogsal

Lib/test/test_traceback.py

@@ -4394,6 +4394,51 @@ def __init__(self):
         # Verify it's a single suggestion, not multiple
         self.assertEqual(actual.count("Did you mean"), 1)
 
+    def test_getattr_nested_handles_attribute_access_exceptions(self):
+        # Test that exceptions raised when accessing attributes don't crash the suggestion system
+        class ExplodingProperty:
+            @property
+            def exploding_attr(self):
+                raise RuntimeError("BOOM! This property always explodes")
+
+            def __repr__(self):
+                raise RuntimeError("repr also explodes")
+
+        class SafeInner:
+            def __init__(self):
+                self.target = 42
+
+        class Outer:
+            def __init__(self):
+                self.exploder = ExplodingProperty()  # Accessing attributes will raise
+                self.safe_inner = SafeInner()
+
+        # Should still suggest 'safe_inner.target' without crashing
+        # even though accessing exploder.target would raise an exception
+        actual = self.get_suggestion(Outer(), 'target')
+        self.assertIn("'safe_inner.target'", actual)
+
+    def test_getattr_nested_handles_hasattr_exceptions(self):
+        # Test that exceptions in hasattr don't crash the system
+        class WeirdObject:
+            def __getattr__(self, name):
+                if name == 'target':
+                    raise RuntimeError("Can't check for target attribute")
+                raise AttributeError(f"No attribute {name}")
+
+        class NormalInner:
+            def __init__(self):
+                self.target = 100
+
+        class Outer:
+            def __init__(self):
+                self.weird = WeirdObject()  # hasattr will raise for 'target'
+                self.normal = NormalInner()
+
+        # Should still find 'normal.target' even though weird.target check fails
+        actual = self.get_suggestion(Outer(), 'target')
+        self.assertIn("'normal.target'", actual)
+
     def make_module(self, code):
         tmpdir = Path(tempfile.mkdtemp())
         self.addCleanup(shutil.rmtree, tmpdir)

Lib/traceback.py

@@ -1605,25 +1605,18 @@ def _check_for_nested_attribute(obj, wrong_name, attrs):
     """Check if any attribute of obj has the wrong_name as a nested attribute.
 
     Returns the first nested attribute suggestion found, or None.
-    Limited to checking 20 attributes and returning up to 5 suggestions.
+    Limited to checking 20 attributes.
     """
-    nested_suggestions = []
-    max_nested_suggestions = 5
-
     # Check for nested attributes (only one level deep)
     attrs_to_check = [x for x in attrs if not x.startswith('_')][:20]  # Limit number of attributes to check
     for attr_name in attrs_to_check:
-        try:
+        with suppress(Exception):
             attr_obj = getattr(obj, attr_name)
             # Check if the nested attribute has the wrong_name
             if hasattr(attr_obj, wrong_name):
-                nested_suggestions.append(f"{attr_name}.{wrong_name}")
-                if len(nested_suggestions) >= max_nested_suggestions:
-                    break
-        except:
-            pass
+                return f"{attr_name}.{wrong_name}"
 
-    return nested_suggestions[0] if nested_suggestions else None
+    return None
 
 
 def _compute_suggestion_error(exc_value, tb, wrong_name):
@@ -1721,12 +1714,10 @@ def _compute_suggestion_error(exc_value, tb, wrong_name):
 
     # If no direct attribute match found, check for nested attributes
     if not suggestion and isinstance(exc_value, AttributeError):
-        try:
+        with suppress(Exception):
             nested_suggestion = _check_for_nested_attribute(exc_value.obj, wrong_name, d)
             if nested_suggestion:
                 return nested_suggestion
-        except:
-            pass
 
     return suggestion