bpo-25460: Surround suggestions by quotes (GH-25473)

diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py
index d1e1b196c42789105a42302f8d0a460941c7ba90..d93b0f16c91d1286e516deebbe9ef1b86efb3a1a 100644 (file)
--- a/Lib/test/test_exceptions.py
+++ b/Lib/test/test_exceptions.py
@@ -1453,12 +1453,12 @@ class NameErrorTests(unittest.TestCase):
             bluc = None
             print(bluch)
 
-        for func, suggestion in [(Substitution, "blech?"),
-                                (Elimination, "blch?"),
-                                (Addition, "bluchin?"),
-                                (EliminationOverAddition, "blucha?"),
-                                (SubstitutionOverElimination, "blach?"),
-                                (SubstitutionOverAddition, "blach?")]:
+        for func, suggestion in [(Substitution, "'blech'?"),
+                                (Elimination, "'blch'?"),
+                                (Addition, "'bluchin'?"),
+                                (EliminationOverAddition, "'blucha'?"),
+                                (SubstitutionOverElimination, "'blach'?"),
+                                (SubstitutionOverAddition, "'blach'?")]:
             err = None
             try:
                 func()
@@ -1475,7 +1475,7 @@ class NameErrorTests(unittest.TestCase):
         except NameError as exc:
             with support.captured_stderr() as err:
                 sys.__excepthook__(*sys.exc_info())
-        self.assertIn("global_for_suggestions?", err.getvalue())
+        self.assertIn("'global_for_suggestions'?", err.getvalue())
 
     def test_name_error_suggestions_from_builtins(self):
         def func():
@@ -1485,7 +1485,7 @@ class NameErrorTests(unittest.TestCase):
         except NameError as exc:
             with support.captured_stderr() as err:
                 sys.__excepthook__(*sys.exc_info())
-        self.assertIn("AttributeError?", err.getvalue())
+        self.assertIn("'AttributeError'?", err.getvalue())
 
     def test_name_error_suggestions_do_not_trigger_for_long_names(self):
         def f():
@@ -1628,12 +1628,12 @@ class AttributeErrorTests(unittest.TestCase):
             blucha = None
             bluc = None
 
-        for cls, suggestion in [(Substitution, "blech?"),
-                                (Elimination, "blch?"),
-                                (Addition, "bluchin?"),
-                                (EliminationOverAddition, "bluc?"),
-                                (SubstitutionOverElimination, "blach?"),
-                                (SubstitutionOverAddition, "blach?")]:
+        for cls, suggestion in [(Substitution, "'blech'?"),
+                                (Elimination, "'blch'?"),
+                                (Addition, "'bluchin'?"),
+                                (EliminationOverAddition, "'bluc'?"),
+                                (SubstitutionOverElimination, "'blach'?"),
+                                (SubstitutionOverAddition, "'blach'?")]:
             try:
                 cls().bluch
             except AttributeError as exc:

diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 6f84cab702e980c632d35e7b066bd2d39b96cac7..8bd31348b2676de45b65862b69cd87f8d2e8e2a4 100644 (file)
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -956,10 +956,10 @@ print_exception(PyObject *f, PyObject *value)
     PyObject* suggestions = _Py_Offer_Suggestions(value);
     if (suggestions) {
         // Add a trailer ". Did you mean: (...)?"
-        err = PyFile_WriteString(". Did you mean: ", f);
+        err = PyFile_WriteString(". Did you mean: '", f);
         if (err == 0) {
             err = PyFile_WriteObject(suggestions, f, Py_PRINT_RAW);
-            err += PyFile_WriteString("?", f);
+            err += PyFile_WriteString("'?", f);
         }
         Py_DECREF(suggestions);
     } else if (PyErr_Occurred()) {