Skip to content

[3.15] gh-161617: Fix test_clinic, test_tools, test_generated_cases with lazy imports (GH-161618) #161865

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
sobolevn merged 1 commit into from
Nov 12, 2026
+18 −1
Merged

[3.15] gh-161617: Fix test_clinic, test_tools, test_generated_cases with lazy imports (GH-161618) #161865

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 14 additions & 0 deletions Lib/test/support/import_helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,20 @@ def frozen_modules(enabled=True):
_imp._override_frozen_modules_for_tests(0)


@contextlib.contextmanager
def force_eager_imports():
"""Force eager imports inside the context manager."""
original_lazy_imports_filter = sys.get_lazy_imports_filter()
sys.set_lazy_imports_filter(
# Tools must be imported eagerly under this context manager:
lambda importing, imported, fromlist: False
)
try:
yield
finally:
sys.set_lazy_imports_filter(original_lazy_imports_filter)


@contextlib.contextmanager
def multi_interp_extensions_check(enabled=True):
"""Force legacy modules to be allowed in subinterpreters (or not).
Expand Down
5 changes: 4 additions & 1 deletion Lib/test/test_tools/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,10 @@ def skip_if_missing(tool=None):
@contextlib.contextmanager
def imports_under_tool(name, *subdirs):
tooldir = os.path.join(toolsdir, name, *subdirs)
with import_helper.DirsOnSysPath(tooldir) as cm:
with (
import_helper.force_eager_imports(),
import_helper.DirsOnSysPath(tooldir) as cm,
):
yield cm

def import_tool(toolname):
Expand Down
Loading