From 7a041162468b83f6cad667b78ed5c786286aed2b Mon Sep 17 00:00:00 2001 From: Pablo Galindo Date: Mon, 19 Apr 2021 23:35:53 +0100 Subject: bpo-25460: Surround suggestions by quotes (GH-25473) --- Lib/test/test_exceptions.py | 28 ++++++++++++++-------------- Python/pythonrun.c | 4 ++-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py index d1e1b19..d93b0f16 100644 --- 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 6f84cab..8bd3134 100644 --- 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()) { -- cgit v0.12