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

Show file tree
Hide file tree
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 suggestions from code review 
Co-authored-by: Shantanu <12621235+hauntsaninja@users.noreply.github.com>
  • Loading branch information
@encukou @hauntsaninja
encukou and hauntsaninja authored Sep 13, 2024
commit 173f06cafe975c1878c77de02de4d377a3857886
2 changes: 1 addition & 1 deletion Modules/_testsinglephase.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ Here are the modules:

* _testsinglephase_circular
Regression test for gh-123880.
Does not have the common attirbutes & methods.
Does not have the common attributes & methods.
See test_singlephase_circular test.test_import.SinglephaseInitTests.

Module state:
Expand Down
2 changes: 1 addition & 1 deletion Python/import.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1329,7 +1329,7 @@ _extensions_cache_set(PyObject *path, PyObject *name,
* being imported recursively from its PyInit_* or Py_mod_* function.
* (That function presumably handles returning a partially
* constructed module in such a case.)
* We can reuse the existing cache value; it is owned byt the cache.
* We can reuse the existing cache value; it is owned by the cache.
* (Entries get removed from it in exceptional circumstances,
* after interpreter shutdown, and in runtime shutdown.)
*/
Expand Down