Visitar URL original
gh-91058: Add error suggestions to 'import from' import errors by pablogsal · Pull Request #98305 · python/cpython · GitHub
Skip to content

gh-91058: Add error suggestions to 'import from' import errors #98305

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
pablogsal merged 8 commits into from
Oct 25, 2022
Merged

gh-91058: Add error suggestions to 'import from' import errors #98305

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a35c5ac
gh-91058: Add error suggestions to 'import from' import errors
pablogsal Oct 15, 2022
bdbb37d
Add NEWS entry
pablogsal Oct 15, 2022
04e1e03
Update Lib/test/test_traceback.py
pablogsal Oct 16, 2022
77f9de1
Update Lib/test/test_traceback.py
pablogsal Oct 16, 2022
dee788b
Update with latest code
pablogsal Oct 17, 2022
c07068f
fixup! Update with latest code
pablogsal Oct 20, 2022
d6908e5
Apply suggestions from code review
pablogsal Oct 20, 2022
de553f6
Update Lib/test/test_traceback.py
pablogsal Oct 20, 2022
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
Prev Previous commit
Next Next commit
Add NEWS entry
  • Loading branch information
@pablogsal
pablogsal committed Oct 17, 2022
commit bdbb37d25d3b59479be461059f97b6121900aeb1
4 changes: 2 additions & 2 deletions Lib/test/test_call.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,9 +140,9 @@ def test_varargs14_kw(self):
itertools.product, 0, repeat=1, foo=2)

def test_varargs15_kw(self):
msg = r"^ImportError\(\) takes at most 2 keyword arguments \(3 given\)$"
msg = r"^ImportError\(\) takes at most 3 keyword arguments \(4 given\)$"
self.assertRaisesRegex(TypeError, msg,
ImportError, 0, name=1, path=2, foo=3)
ImportError, 0, name=1, path=2, name_from=3, foo=3)

def test_varargs16_kw(self):
msg = r"^min\(\) takes at most 2 keyword arguments \(3 given\)$"
Expand Down
3 changes: 3 additions & 0 deletions Misc/NEWS.d/next/Core and Builtins/2022-10-15-22-25-20.gh-issue-91058.Uo2kW-.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
:exc:`ImportError` raised from failed ``from <module> import <name>`` now
include suggestions for the value of ``<name>`` based on the available names
in ``<module>``. Patch by Pablo Galindo
2 changes: 1 addition & 1 deletion Objects/exceptions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1558,7 +1558,7 @@ ImportError_getstate(PyImportErrorObject *self)
Py_DECREF(dict);
return NULL;
}
if (self->path && PyDict_SetItem(dict, &_Py_ID(name_from), self->name_from) < 0) {
if (self->name_from && PyDict_SetItem(dict, &_Py_ID(name_from), self->name_from) < 0) {
Py_DECREF(dict);
return NULL;
}
Expand Down