Skip to content

bpo-28411: Remove PyInterpreterState.modules. #3606

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

Closed
ericsnowcurrently wants to merge 6 commits into from
Closed

bpo-28411: Remove PyInterpreterState.modules. #3606

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3920902
Look up sys.modules in PyImport_GetModuleDict().
ericsnowcurrently Oct 7, 2016
9c8f4dd
Check sys.modules in _PyImport_EnsureInitialized().
ericsnowcurrently Oct 10, 2016
4e97cbf
Drop PyInterpreterState.modules.
ericsnowcurrently Oct 7, 2016
19694f3
Add a Misc/NEWS entry.
ericsnowcurrently Sep 4, 2017
548428c
Add a whatsnew entry for porting.
ericsnowcurrently Sep 4, 2017
b31768e
Use PyImport_GetModuleDict() in pickle.
ericsnowcurrently Sep 15, 2017
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
Next Next commit
Look up sys.modules in PyImport_GetModuleDict().
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Sep 15, 2017
commit 3920902cf54118351a5249166e959f568c28a57d
14 changes: 10 additions & 4 deletions Python/import.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,11 +290,17 @@ _PyImport_Fini(void)
PyObject *
PyImport_GetModuleDict(void)
{
PyInterpreterState *interp = PyThreadState_GET()->interp;
if (interp->modules == NULL) {
Py_FatalError("PyImport_GetModuleDict: no module dictionary!");
PyObject *sysdict = PyThreadState_GET()->interp->sysdict;
if (sysdict == NULL) {
Py_FatalError("PyImport_GetModuleDict: no sys module!");
}

_Py_IDENTIFIER(modules);
PyObject *modules = _PyDict_GetItemId(sysdict, &PyId_modules);
if (modules == NULL) {
Py_FatalError("lost sys.modules");
}
return interp->modules;
return modules;
}

/* In some corner cases it is important to be sure that the import
Expand Down