mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 22:18:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

bpo-38530: Match exactly AttributeError and NameError when offering suggestions (GH-25443)

Browse source
This commit is contained in:
Pablo Galindo 2021-04-16 17:12:03 +01:00 • committed by GitHub
parent 3b82cae774
commit 0ad81d4db2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Lib/test/test_exceptions.py
View file

@ -1537,6 +1537,21 @@ class NameErrorTests(unittest.TestCase):
self.assertNotIn("blech", err.getvalue()) self.assertNotIn("blech", err.getvalue())
def test_unbound_local_error_doesn_not_match(self):
def foo():
something = 3
print(somethong)
somethong = 3
try:
foo()
except UnboundLocalError as exc:
with support.captured_stderr() as err:
sys.__excepthook__(*sys.exc_info())
self.assertNotIn("something", err.getvalue())
class AttributeErrorTests(unittest.TestCase): class AttributeErrorTests(unittest.TestCase):
def test_attributes(self): def test_attributes(self):
# Setting 'attr' should not be a problem. # Setting 'attr' should not be a problem.

4
Python/suggestions.c
View file

@ -181,9 +181,9 @@ offer_suggestions_for_name_error(PyNameErrorObject *exc) {
PyObject *_Py_Offer_Suggestions(PyObject *exception) { PyObject *_Py_Offer_Suggestions(PyObject *exception) {
PyObject *result = NULL; PyObject *result = NULL;
assert(!PyErr_Occurred()); assert(!PyErr_Occurred());
if (PyErr_GivenExceptionMatches(exception, PyExc_AttributeError)) { if (Py_IS_TYPE(exception, (PyTypeObject*)PyExc_AttributeError)) {
result = offer_suggestions_for_attribute_error((PyAttributeErrorObject *) exception); result = offer_suggestions_for_attribute_error((PyAttributeErrorObject *) exception);
} else if (PyErr_GivenExceptionMatches(exception, PyExc_NameError)) { } else if (Py_IS_TYPE(exception, (PyTypeObject*)PyExc_NameError)) {
result = offer_suggestions_for_name_error((PyNameErrorObject *) exception); result = offer_suggestions_for_name_error((PyNameErrorObject *) exception);
} }
return result; return result;