Skip to content

gh-117178: Recover lazy loading of self-referential modules #117179

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
hugovk merged 4 commits into from
Mar 28, 2024
Merged

gh-117178: Recover lazy loading of self-referential modules #117179

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
367cdc1
Add test for gh-117178
effigies Mar 23, 2024
fd630e7
fix gh-117178: Fall back to object.__getattribute__ for any reentrant…
effigies Mar 23, 2024
7da3f1b
Update test_lazy_self_referential_modules to verify behavior of loade…
effigies Mar 23, 2024
e5e6d65
Add news blurb
effigies Mar 23, 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
fix gh-117178: Fall back to object.__getattribute__ for any reentrant… 
… lookups
  • Loading branch information
@effigies
effigies committed Mar 23, 2024
commit fd630e77df46dd5b1e46b3d1f39ea0cf12ee9a5f
11 changes: 5 additions & 6 deletions Lib/importlib/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,12 +178,11 @@ def __getattribute__(self, attr):
# Only the first thread to get the lock should trigger the load
# and reset the module's class. The rest can now getattr().
if object.__getattribute__(self, '__class__') is _LazyModule:
# The first thread comes here multiple times as it descends the
# call stack. The first time, it sets is_loading and triggers
# exec_module(), which will access module.__dict__, module.__name__,
# and/or module.__spec__, reentering this method. These accesses
# need to be allowed to proceed without triggering the load again.
if loader_state['is_loading'] and attr.startswith('__') and attr.endswith('__'):
# Reentrant calls from the same thread must be allowed to proceed without
# triggering the load again.
# exec_module() and self-referential imports are the primary ways this can
# happen, but in any case we must return something to avoid deadlock.
if loader_state['is_loading']:
return object.__getattribute__(self, attr)
loader_state['is_loading'] = True

Expand Down