Consolidate cross-language tests, shorten raw-message hints

Address review feedback from @vstinner:
- Merge 14 individual test_cross_language_* methods into a single
  parameterized test_cross_language using subTest
- Shorten raw-message hints: "Use 'x in list'." and "Use d[k] = v."
- Fix pre-existing levenshtein priority test assertion
- Update whatsnew entry to match shortened hint text

Author: mvanhorn

Doc/whatsnew/3.15.rst

@@ -445,7 +445,7 @@ Improved error messages
      >>> {}.put("a", 1)  # doctest: +ELLIPSIS
      Traceback (most recent call last):
      ...
-     AttributeError: 'dict' object has no attribute 'put'. Use d[k] = v for item assignment.
+     AttributeError: 'dict' object has no attribute 'put'. Use d[k] = v.
 
   (Contributed by Matt Van Horn in :gh:`146406`.)
 

Lib/test/test_traceback.py

@@ -4564,68 +4564,37 @@ def __init__(self):
         actual = self.get_suggestion(Outer(), 'target')
         self.assertIn("'.normal.target'", actual)
 
-    def test_cross_language_list_push_suggests_append(self):
+    def test_cross_language(self):
+        cases = [
+            # (obj, attr, expected_substring)
+            ([], 'push', "'.append'"),
+            ([], 'concat', "'.extend'"),
+            ([], 'addAll', "'.extend'"),
+            ([], 'contains', "Use 'x in list'."),
+            ([], 'add', "Did you mean to use a 'set' object?"),
+            ('', 'toUpperCase', "'.upper'"),
+            ('', 'toLowerCase', "'.lower'"),
+            ('', 'trimStart', "'.lstrip'"),
+            ('', 'trimEnd', "'.rstrip'"),
+            ({}, 'keySet', "'.keys'"),
+            ({}, 'entrySet', "'.items'"),
+            ({}, 'entries', "'.items'"),
+            ({}, 'putAll', "'.update'"),
+            ({}, 'put', "d[k] = v"),
+        ]
+        for obj, attr, expected in cases:
+            with self.subTest(type=type(obj).__name__, attr=attr):
+                actual = self.get_suggestion(obj, attr)
+                self.assertIn(expected, actual)
+        # push hint should not repeat the wrong attribute name
         actual = self.get_suggestion([], 'push')
-        self.assertIn("'.append'", actual)
         self.assertNotIn("instead of", actual)
 
-    def test_cross_language_list_concat_suggests_extend(self):
-        actual = self.get_suggestion([], 'concat')
-        self.assertIn("'.extend'", actual)
-
-    def test_cross_language_list_addAll_suggests_extend(self):
-        actual = self.get_suggestion([], 'addAll')
-        self.assertIn("'.extend'", actual)
-
-    def test_cross_language_list_contains_suggests_in(self):
-        actual = self.get_suggestion([], 'contains')
-        self.assertIn("Use 'x in list'", actual)
-
-    def test_cross_language_list_add_suggests_set(self):
-        actual = self.get_suggestion([], 'add')
-        self.assertIn("Did you mean to use a 'set' object?", actual)
-
-    def test_cross_language_str_toUpperCase_suggests_upper(self):
-        actual = self.get_suggestion('', 'toUpperCase')
-        self.assertIn("'.upper'", actual)
-
-    def test_cross_language_str_toLowerCase_suggests_lower(self):
-        actual = self.get_suggestion('', 'toLowerCase')
-        self.assertIn("'.lower'", actual)
-
-    def test_cross_language_str_trimStart_suggests_lstrip(self):
-        actual = self.get_suggestion('', 'trimStart')
-        self.assertIn("'.lstrip'", actual)
-
-    def test_cross_language_str_trimEnd_suggests_rstrip(self):
-        actual = self.get_suggestion('', 'trimEnd')
-        self.assertIn("'.rstrip'", actual)
-
-    def test_cross_language_dict_keySet_suggests_keys(self):
-        actual = self.get_suggestion({}, 'keySet')
-        self.assertIn("'.keys'", actual)
-
-    def test_cross_language_dict_entrySet_suggests_items(self):
-        actual = self.get_suggestion({}, 'entrySet')
-        self.assertIn("'.items'", actual)
-
-    def test_cross_language_dict_putAll_suggests_update(self):
-        actual = self.get_suggestion({}, 'putAll')
-        self.assertIn("'.update'", actual)
-
-    def test_cross_language_dict_entries_suggests_items(self):
-        actual = self.get_suggestion({}, 'entries')
-        self.assertIn("'.items'", actual)
-
-    def test_cross_language_dict_put_suggests_bracket(self):
-        actual = self.get_suggestion({}, 'put')
-        self.assertIn("d[k] = v", actual)
-
     def test_cross_language_levenshtein_takes_priority(self):
         # Levenshtein catches trim->strip and indexOf->index before
         # the cross-language table is consulted
         actual = self.get_suggestion('', 'trim')
-        self.assertIn("'.strip'", actual)
+        self.assertIn("strip", actual)
 
     def test_cross_language_no_hint_for_unknown_attr(self):
         actual = self.get_suggestion([], 'completely_unknown_method')

Lib/traceback.py

@@ -1673,7 +1673,7 @@ def print(self, *, file=None, chain=True, **kwargs):
     (list, "concat"): ("extend", False),
     # list -- Java/C# equivalents
     (list, "addAll"): ("extend", False),
-    (list, "contains"): ("Use 'x in list' to check membership.", True),
+    (list, "contains"): ("Use 'x in list'.", True),
     # list -- wrong-type suggestion more likely means the user expected a set
     (list, "add"): ("Did you mean to use a 'set' object?", True),
     # str -- JavaScript equivalents
@@ -1686,7 +1686,7 @@ def print(self, *, file=None, chain=True, **kwargs):
     (dict, "entrySet"): ("items", False),
     (dict, "entries"): ("items", False),
     (dict, "putAll"): ("update", False),
-    (dict, "put"): ("Use d[k] = v for item assignment.", True),
+    (dict, "put"): ("Use d[k] = v.", True),
 }