Skip to content

gh-123880: Allow recursive import of single-phase-init modules #123950

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
encukou merged 13 commits into from
Sep 20, 2024
Merged

gh-123880: Allow recursive import of single-phase-init modules #123950

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
1700e33
gh-123880: Allow recursive import of single-phase-init modules
encukou Sep 11, 2024
484678f
Add regression test
encukou Sep 12, 2024
78852fa
Add a blurb
encukou Sep 12, 2024
173f06c
Apply suggestions from code review
encukou Sep 13, 2024
48a6c1d
Record the intentional static global
encukou Sep 13, 2024
a1da713
Apply typo fixes from code review
encukou Sep 16, 2024
16dc155
Use more shared helpers
encukou Sep 16, 2024
5fc359b
Merge in the main branch
encukou Sep 16, 2024
c67517d
Add @requires_singlephase_init decorator
encukou Sep 17, 2024
de9840c
Skip if _testsinglephase is not available
encukou Sep 17, 2024
c7392f7
Also use the test helper for the Python helper module
encukou Sep 17, 2024
aa825d2
Merge in the main branch
encukou Sep 17, 2024
72cd269
Merge branch 'main' into spi-cache
encukou Sep 18, 2024
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
Apply typo fixes from code review 
Co-authored-by: Brett Cannon <brett@python.org>
  • Loading branch information
@encukou @brettcannon
encukou and brettcannon authored Sep 16, 2024
commit a1da71340938da0a887acad57b036d25fb07552f
6 changes: 3 additions & 3 deletions Python/import.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -815,8 +815,8 @@ static int clear_singlephase_extension(PyInterpreterState *interp,

// Currently, this is only used for testing.
// (See _testinternalcapi.clear_extension().)
// If adding another use uses, careful about modules that import themselves
// recursively (see gh-123880)
// If adding another use, be careful about modules that import themselves
// recursively (see gh-123880).
int
_PyImport_ClearExtension(PyObject *name, PyObject *filename)
{
Expand Down Expand Up @@ -2135,7 +2135,7 @@ import_run_extension(PyThreadState *tstate, PyModInitFunction p0,
}


// Used in _PyImport_ClearExtension; see notes there
// Used in _PyImport_ClearExtension; see notes there.
static int
clear_singlephase_extension(PyInterpreterState *interp,
PyObject *name, PyObject *path)
Expand Down