Skip to content

Commit 7a04116

Browse files
authored
bpo-25460: Surround suggestions by quotes (GH-25473)
1 parent 4f9ffa8 commit 7a04116

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

Lib/test/test_exceptions.py

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1453,12 +1453,12 @@ def EliminationOverAddition():
14531453
bluc = None
14541454
print(bluch)
14551455

1456-
for func, suggestion in [(Substitution, "blech?"),
1457-
(Elimination, "blch?"),
1458-
(Addition, "bluchin?"),
1459-
(EliminationOverAddition, "blucha?"),
1460-
(SubstitutionOverElimination, "blach?"),
1461-
(SubstitutionOverAddition, "blach?")]:
1456+
for func, suggestion in [(Substitution, "'blech'?"),
1457+
(Elimination, "'blch'?"),
1458+
(Addition, "'bluchin'?"),
1459+
(EliminationOverAddition, "'blucha'?"),
1460+
(SubstitutionOverElimination, "'blach'?"),
1461+
(SubstitutionOverAddition, "'blach'?")]:
14621462
err = None
14631463
try:
14641464
func()
@@ -1475,7 +1475,7 @@ def func():
14751475
except NameError as exc:
14761476
with support.captured_stderr() as err:
14771477
sys.__excepthook__(*sys.exc_info())
1478-
self.assertIn("global_for_suggestions?", err.getvalue())
1478+
self.assertIn("'global_for_suggestions'?", err.getvalue())
14791479

14801480
def test_name_error_suggestions_from_builtins(self):
14811481
def func():
@@ -1485,7 +1485,7 @@ def func():
14851485
except NameError as exc:
14861486
with support.captured_stderr() as err:
14871487
sys.__excepthook__(*sys.exc_info())
1488-
self.assertIn("AttributeError?", err.getvalue())
1488+
self.assertIn("'AttributeError'?", err.getvalue())
14891489

14901490
def test_name_error_suggestions_do_not_trigger_for_long_names(self):
14911491
def f():
@@ -1628,12 +1628,12 @@ class EliminationOverAddition:
16281628
blucha = None
16291629
bluc = None
16301630

1631-
for cls, suggestion in [(Substitution, "blech?"),
1632-
(Elimination, "blch?"),
1633-
(Addition, "bluchin?"),
1634-
(EliminationOverAddition, "bluc?"),
1635-
(SubstitutionOverElimination, "blach?"),
1636-
(SubstitutionOverAddition, "blach?")]:
1631+
for cls, suggestion in [(Substitution, "'blech'?"),
1632+
(Elimination, "'blch'?"),
1633+
(Addition, "'bluchin'?"),
1634+
(EliminationOverAddition, "'bluc'?"),
1635+
(SubstitutionOverElimination, "'blach'?"),
1636+
(SubstitutionOverAddition, "'blach'?")]:
16371637
try:
16381638
cls().bluch
16391639
except AttributeError as exc:

Python/pythonrun.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -956,10 +956,10 @@ print_exception(PyObject *f, PyObject *value)
956956
PyObject* suggestions = _Py_Offer_Suggestions(value);
957957
if (suggestions) {
958958
// Add a trailer ". Did you mean: (...)?"
959-
err = PyFile_WriteString(". Did you mean: ", f);
959+
err = PyFile_WriteString(". Did you mean: '", f);
960960
if (err == 0) {
961961
err = PyFile_WriteObject(suggestions, f, Py_PRINT_RAW);
962-
err += PyFile_WriteString("?", f);
962+
err += PyFile_WriteString("'?", f);
963963
}
964964
Py_DECREF(suggestions);
965965
} else if (PyErr_Occurred()) {

0 commit comments

Comments
 (0)