Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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

This commit is contained in:
Pablo Galindo 2021-04-19 23:35:53 +01:00 committed by GitHub
parent 4f9ffa8f9c
commit 7a04116246
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Lib/test/test_exceptions.py
View File

@ -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:

4
Python/pythonrun.c
View File

@ -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()) {