FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

gh-142029: Raise `ModuleNotFoundError` instead of crashing on nonexsistent module name given to `create_builtin()` by dr-carlos · Pull Request #142054 · python/cpython · GitHub

/ cpython Public

gh-142029: Raise ModuleNotFoundError instead of crashing on nonexsistent module name given to create_builtin() #142054

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
vstinner merged 13 commits into from
Dec 15, 2025
Conversation 21 Commits 13 Checks 44 Files changed
Merged

gh-142029: Raise ModuleNotFoundError instead of crashing on nonexsistent module name given to create_builtin() #142054

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
e85b222
Don't assume that all non-found modules in `create_builtin()` are `sy…
dr-carlos Nov 28, 2025
68e2b7e
Add tests for internal and nonexistent modules passed to `create_buil…
dr-carlos Nov 28, 2025
603d98b
Add NEWS entry
dr-carlos Nov 28, 2025
d45c2d9
Properly handle `inittab` entries with no `initfunc`
dr-carlos Dec 1, 2025
d07443c
Raise `ModuleNotFoundError` instead of returning `None`
dr-carlos Dec 2, 2025
5c67d47
Update NEWS entry
dr-carlos Dec 2, 2025
b639e70
Merge branch 'main' into importlib-nonexistent-builtin
dr-carlos Dec 9, 2025
42974ac
Merge branch 'main' into importlib-nonexistent-builtin
dr-carlos Dec 11, 2025
225a143
Merge branch 'main' into importlib-nonexistent-builtin
brettcannon Dec 12, 2025
40a9c84
Fix typo in `test_import`
dr-carlos Dec 12, 2025
0739d71
Merge branch 'main' into importlib-nonexistent-builtin
brettcannon Dec 12, 2025
565836e
Temporarily remove sys/builtin create_builtin tests
dr-carlos Dec 13, 2025
11ceded
Re-add `create_builtin(sys)` test
dr-carlos Dec 14, 2025
File filter

Filter by extension

Filter by extension .c  (1) .py  (1) .rst  (1) All 3 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
12 changes: 10 additions & 2 deletions Lib/test/test_import/__init__.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -1255,15 +1255,23 @@ class Spec2:

def test_create_builtin(self):
class Spec:
name = None
pass
spec = Spec()

spec.name = "sys"
self.assertIs(_imp.create_builtin(spec), sys)

spec.name = None
with self.assertRaisesRegex(TypeError, 'name must be string, not NoneType'):
_imp.create_builtin(spec)

spec.name = ""
# gh-142029
spec.name = "nonexistent_lib"
with self.assertRaises(ModuleNotFoundError):
_imp.create_builtin(spec)

# gh-142029
spec.name = ""
with self.assertRaisesRegex(ValueError, 'name must not be empty'):
_imp.create_builtin(spec)

Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Core_and_Builtins/2025-11-29-08-51-56.gh-issue-142029.rUpcmt.rst
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Raise :exc:`ModuleNotFoundError` instead of crashing when a nonexistent module
is used as a name in ``_imp.create_builtin()``.
32 changes: 22 additions & 10 deletions Python/import.c
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -2383,12 +2383,12 @@ is_builtin(PyObject *name)
return 0;
}

static PyModInitFunction
lookup_inittab_initfunc(const struct _Py_ext_module_loader_info* info)
static struct _inittab*
lookup_inittab_entry(const struct _Py_ext_module_loader_info* info)
{
for (struct _inittab *p = INITTAB; p->name != NULL; p++) {
if (_PyUnicode_EqualToASCIIString(info->name, p->name)) {
return (PyModInitFunction)p->initfunc;
return p;
}
}
// not found
Expand Down Expand Up @@ -2430,16 +2430,28 @@ create_builtin(
_extensions_cache_delete(info.path, info.name);
}

PyModInitFunction p0 = initfunc;
if (p0 == NULL) {
p0 = lookup_inittab_initfunc(&info);
if (p0 == NULL) {
/* Cannot re-init internal module ("sys" or "builtins") */
assert(is_core_module(tstate->interp, info.name, info.path));
mod = import_add_module(tstate, info.name);
PyModInitFunction p0 = NULL;
if (initfunc == NULL) {
struct _inittab *entry = lookup_inittab_entry(&info);
if (entry == NULL) {
mod = NULL;
_PyErr_SetModuleNotFoundError(name);
goto finally;
}

p0 = (PyModInitFunction)entry->initfunc;
}
else {
p0 = initfunc;
}

if (p0 == NULL) {
/* Cannot re-init internal module ("sys" or "builtins") */
assert(is_core_module(tstate->interp, info.name, info.path));
mod = import_add_module(tstate, info.name);
goto finally;
}


#ifdef Py_GIL_DISABLED
// This call (and the corresponding call to _PyImport_CheckGILForModule())
Expand Down
Loading
Back | FazBrowse Home | New Git URL