Skip to content

gh-101758: Add a Test For Single-Phase Init Module Variants #101891

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 8 commits into from
Feb 14, 2023
Merged

gh-101758: Add a Test For Single-Phase Init Module Variants #101891

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6c9bd47
Factor out fix_up_extension().
ericsnowcurrently Feb 13, 2023
8c0258a
Add an explanation about single-phase init variants.
ericsnowcurrently Feb 13, 2023
d5a0fe6
Add a TODO comment.
ericsnowcurrently Feb 13, 2023
97dee17
Add the _testsinglephase_* modules.
ericsnowcurrently Feb 10, 2023
83aaef1
Add test_imp.ImportTests.test_singlephase_variants.
ericsnowcurrently Feb 13, 2023
285fcb9
Handle errors from _PyTime_GetMonotonicClock() correctly.
ericsnowcurrently Feb 14, 2023
250606a
Return seconds from mod.initialized() instead of nanoseconds.
ericsnowcurrently Feb 14, 2023
b7bf588
Make state->initialized strictly monotonic.
ericsnowcurrently Feb 14, 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
Factor out fix_up_extension().
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Feb 13, 2023
commit 6c9bd476448d68d3849957e88f1463ff70cc57a7
39 changes: 29 additions & 10 deletions Python/import.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,9 +489,8 @@ _extensions_cache_clear(void)
Py_CLEAR(_PyRuntime.imports.extensions);
}

int
_PyImport_FixupExtensionObject(PyObject *mod, PyObject *name,
PyObject *filename, PyObject *modules)
static int
fix_up_extension(PyObject *mod, PyObject *name, PyObject *filename)
{
if (mod == NULL || !PyModule_Check(mod)) {
PyErr_BadInternalCall();
Expand All @@ -505,11 +504,7 @@ _PyImport_FixupExtensionObject(PyObject *mod, PyObject *name,
}

PyThreadState *tstate = _PyThreadState_GET();
if (PyObject_SetItem(modules, name, mod) < 0) {
return -1;
}
if (_PyState_AddModule(tstate, mod, def) < 0) {
PyMapping_DelItem(modules, name);
return -1;
}

Expand Down Expand Up @@ -541,15 +536,39 @@ _PyImport_FixupExtensionObject(PyObject *mod, PyObject *name,
return 0;
}

int
_PyImport_FixupExtensionObject(PyObject *mod, PyObject *name,
PyObject *filename, PyObject *modules)
{
if (PyObject_SetItem(modules, name, mod) < 0) {
return -1;
}
if (fix_up_extension(mod, name, filename) < 0) {
PyMapping_DelItem(modules, name);
return -1;
}
return 0;
}

int
_PyImport_FixupBuiltin(PyObject *mod, const char *name, PyObject *modules)
{
int res;
int res = -1;
PyObject *nameobj;
nameobj = PyUnicode_InternFromString(name);
if (nameobj == NULL)
if (nameobj == NULL) {
return -1;
res = _PyImport_FixupExtensionObject(mod, nameobj, nameobj, modules);
}
if (PyObject_SetItem(modules, nameobj, mod) < 0) {
goto finally;
}
if (fix_up_extension(mod, nameobj, nameobj) < 0) {
PyMapping_DelItem(modules, nameobj);
goto finally;
}
res = 0;

finally:
Py_DECREF(nameobj);
return res;
}
Expand Down