Add another test for NameError for property function, and also wrap exception around hasattr block

Author: srinivasreddy

Lib/test/test_traceback.py

@@ -4507,6 +4507,16 @@ def __getattribute__(self, x):
                 self.assertIn("name 'qq' is not defined", actual)
                 self.assertEqual(actual.count("NameError"), 1)
 
+    def test_name_error_with_property_name(self):
+        class A:
+            @property
+            def past(self):
+                past
+        instance = A()
+        actual = self.get_suggestion(instance, "past")
+        self.assertIn("name 'past' is not defined", actual)
+        self.assertEqual(actual.count("NameError"), 1)
+
     def test_unbound_local_error_does_not_match(self):
         def func():
             something = 3

Lib/traceback.py

@@ -1520,9 +1520,11 @@ def _compute_suggestion_error(exc_value, tb, wrong_name):
         # has the wrong name as attribute
         if 'self' in frame.f_locals:
             self = frame.f_locals['self']
-            if frame.f_code.co_name not in ('__getattr__', '__getattribute__'):
+            try:
                 if hasattr(self, wrong_name):
                     return f"self.{wrong_name}"
+            except Exception:
+                return None
 
     try:
         import _suggestions