Skip to content

bpo-38530: Surround suggestions by quotes #25473

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 19, 2021
Merged

bpo-38530: Surround suggestions by quotes #25473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions Lib/test/test_exceptions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1453,12 +1453,12 @@ def EliminationOverAddition():
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()
Expand All @@ -1475,7 +1475,7 @@ def func():
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():
Expand All @@ -1485,7 +1485,7 @@ def func():
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():
Expand Down Expand Up @@ -1628,12 +1628,12 @@ class EliminationOverAddition:
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:
Expand Down
4 changes: 2 additions & 2 deletions Python/pythonrun.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()) {
Expand Down