Skip to content

gh-102660: Handle m_copy Specially for the sys and builtins Modules #102661

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
ericsnowcurrently merged 2 commits into from
Mar 14, 2023
+44 −4
Merged

gh-102660: Handle m_copy Specially for the sys and builtins Modules #102661

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6a4555
Add PyInterpreterState.sysdict_copy.
ericsnowcurrently Mar 13, 2023
617f03a
Set m_copy to None for sys and builtins.
ericsnowcurrently Mar 13, 2023
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
Add PyInterpreterState.sysdict_copy.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Mar 13, 2023
commit f6a45557e764f81908e18a49ea15a2a83514eaaa
1 change: 1 addition & 0 deletions Include/internal/pycore_interp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ struct _is {

PyObject *dict; /* Stores per-interpreter state */

PyObject *sysdict_copy;
PyObject *builtins_copy;
// Initialized to _PyEval_EvalFrameDefault().
_PyFrameEvalFunction eval_frame;
Expand Down
1 change: 1 addition & 0 deletions Python/pystate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -805,6 +805,7 @@ interpreter_clear(PyInterpreterState *interp, PyThreadState *tstate)
assert(interp->imports.importlib == NULL);
assert(interp->imports.import_func == NULL);

Py_CLEAR(interp->sysdict_copy);
Py_CLEAR(interp->builtins_copy);
Py_CLEAR(interp->dict);
#ifdef HAVE_FORK
Expand Down
5 changes: 5 additions & 0 deletions Python/sysmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3427,6 +3427,11 @@ _PySys_Create(PyThreadState *tstate, PyObject **sysmod_p)
}
interp->sysdict = Py_NewRef(sysdict);

interp->sysdict_copy = PyDict_Copy(sysdict);
if (interp->sysdict_copy == NULL) {
goto error;
}

if (PyDict_SetItemString(sysdict, "modules", modules) < 0) {
goto error;
}
Expand Down