gh-145334: Make lazy import tests discoverable (#145336)

This commit is contained in:
Bartosz Sławecki
2026-02-28 02:44:50 +01:00
committed by GitHub
parent 180d58cbcc
commit a66d51876d
74 changed files with 273 additions and 259 deletions
+1 -2
View File
@@ -298,8 +298,7 @@ InternalDocs/jit.md @brandtbucher @savannahostrowski @diegorusso @AA-T
# Lazy imports (PEP 810)
Objects/lazyimportobject.c @yhg1s @DinoV @pablogsal
Include/internal/pycore_lazyimportobject.h @yhg1s @DinoV @pablogsal
Lib/test/test_import/test_lazy_imports.py @yhg1s @DinoV @pablogsal
Lib/test/test_import/data/lazy_imports/ @yhg1s @DinoV @pablogsal
Lib/test/test_lazy_import @yhg1s @DinoV @pablogsal
# Micro-op / μop / Tier 2 Optimiser
Python/optimizer.c @markshannon @Fidget-Spinner
+3 -2
View File
@@ -15,8 +15,9 @@ extend-exclude = [
# and tests re-use the same names as only the grammar is being checked.
"test_grammar.py",
# Lazy import syntax (PEP 810) is not yet supported by Ruff
"test_import/data/lazy_imports/*.py",
"test_import/data/lazy_imports/**/*.py",
"test_lazy_import/__init__.py",
"test_lazy_import/data/*.py",
"test_lazy_import/data/**/*.py",
]
[lint]
@@ -1,2 +0,0 @@
__lazy_modules__ = ['test.test_import.data.lazy_imports.basic2']
import test.test_import.data.lazy_imports.basic2
@@ -1,2 +0,0 @@
__lazy_modules__ = ['test.test_import.data.lazy_imports.basic2']
lazy from .basic2 import f
@@ -1,3 +0,0 @@
__lazy_modules__ = ['test.test_import.data.lazy_imports.basic2']
import test.test_import.data.lazy_imports.basic2
test.test_import.data.lazy_imports.basic2.f()
@@ -1,2 +0,0 @@
lazy import test.test_import.data.lazy_imports.basic2
x = dir()
@@ -1 +0,0 @@
lazy from test.test_import.data.lazy_imports import basic2
@@ -1 +0,0 @@
lazy import test.test_import.data.lazy_imports.basic2
@@ -1,3 +0,0 @@
lazy import test.test_import.data.lazy_imports.basic2 as basic2
basic2.f()
@@ -1,5 +0,0 @@
__lazy_modules__ = ['test.test_import.data.lazy_imports.basic2']
def f():
import test.test_import.data.lazy_imports.basic2
f()
@@ -1,5 +0,0 @@
__lazy_modules__ = ['test.test_import.data.lazy_imports.basic2']
try:
import test.test_import.data.lazy_imports.basic2
except:
pass
@@ -1 +0,0 @@
basic = __lazy_import__('test.test_import.data.lazy_imports.basic2')
@@ -1,3 +0,0 @@
basic = __lazy_import__('test.test_import.data.lazy_imports',
fromlist=("basic2", ))
basic
@@ -1,3 +0,0 @@
def f():
import test.test_import.data.lazy_imports.basic2 as basic2
return basic2
@@ -1,5 +0,0 @@
import sys
sys.set_lazy_imports("none")
lazy import test.test_import.data.lazy_imports.basic2 as basic2
@@ -1,5 +0,0 @@
import sys
sys.set_lazy_imports("all")
import test.test_import.data.lazy_imports.basic2 as basic2
@@ -1,6 +0,0 @@
# Test __lazy_modules__ with from imports
__lazy_modules__ = ['test.test_import.data.lazy_imports.basic2']
from test.test_import.data.lazy_imports.basic2 import x, f
def get_x():
return x
@@ -1,2 +0,0 @@
lazy import test.test_import.data.lazy_imports.pkg.bar
x = test.test_import.data.lazy_imports.pkg.bar.f
@@ -1,3 +0,0 @@
import contextlib
with contextlib.nullcontext():
lazy import test.test_import.data.lazy_imports.basic2
@@ -1,3 +0,0 @@
import contextlib
with contextlib.nullcontext():
lazy import test.test_import.data.lazy_imports.basic2 as basic2
@@ -1,5 +0,0 @@
lazy import test.test_import.data.lazy_imports.basic2 as basic2
import sys
mod = sys.modules[__name__]
x = mod.__dict__
@@ -1,5 +0,0 @@
lazy import test.test_import.data.lazy_imports.basic2 as basic2
import sys
mod = sys.modules[__name__]
x = mod.basic2
@@ -1,5 +0,0 @@
lazy import test.test_import.data.lazy_imports.basic2 as basic2
import sys
mod = sys.modules[__name__]
x = mod.__name__
@@ -1,4 +0,0 @@
try:
import test.test_import.data.lazy_imports.basic2
except:
pass
@@ -1,4 +0,0 @@
try:
from test.test_import.data.lazy_imports.basic2 import f
except:
pass
@@ -11,6 +11,8 @@ import unittest
import tempfile
import os
from test import support
try:
import _testcapi
except ImportError:
@@ -23,7 +25,7 @@ class LazyImportTests(unittest.TestCase):
def tearDown(self):
"""Clean up any test modules from sys.modules."""
for key in list(sys.modules.keys()):
if key.startswith('test.test_import.data.lazy_imports'):
if key.startswith('test.test_lazy_import.data'):
del sys.modules[key]
sys.set_lazy_imports_filter(None)
@@ -32,58 +34,58 @@ class LazyImportTests(unittest.TestCase):
def test_basic_unused(self):
"""Lazy imported module should not be loaded if never accessed."""
import test.test_import.data.lazy_imports.basic_unused
self.assertNotIn("test.test_import.data.lazy_imports.basic2", sys.modules)
self.assertIn("test.test_import.data.lazy_imports", sys.lazy_modules)
self.assertEqual(sys.lazy_modules["test.test_import.data.lazy_imports"], {"basic2"})
import test.test_lazy_import.data.basic_unused
self.assertNotIn("test.test_lazy_import.data.basic2", sys.modules)
self.assertIn("test.test_lazy_import.data", sys.lazy_modules)
self.assertEqual(sys.lazy_modules["test.test_lazy_import.data"], {"basic2"})
def test_sys_lazy_modules(self):
try:
import test.test_import.data.lazy_imports.basic_from_unused
import test.test_lazy_import.data.basic_from_unused
except ImportError as e:
self.fail('lazy import failed')
self.assertFalse("test.test_import.data.lazy_imports.basic2" in sys.modules)
self.assertIn("test.test_import.data.lazy_imports", sys.lazy_modules)
self.assertEqual(sys.lazy_modules["test.test_import.data.lazy_imports"], {"basic2"})
test.test_import.data.lazy_imports.basic_from_unused.basic2
self.assertFalse("test.test_lazy_import.data.basic2" in sys.modules)
self.assertIn("test.test_lazy_import.data", sys.lazy_modules)
self.assertEqual(sys.lazy_modules["test.test_lazy_import.data"], {"basic2"})
test.test_lazy_import.data.basic_from_unused.basic2
self.assertNotIn("test.test_import.data", sys.lazy_modules)
def test_basic_unused_use_externally(self):
"""Lazy import should load module when accessed from outside."""
from test.test_import.data.lazy_imports import basic_unused
from test.test_lazy_import.data import basic_unused
self.assertNotIn("test.test_import.data.lazy_imports.basic2", sys.modules)
x = basic_unused.test.test_import.data.lazy_imports.basic2
self.assertIn("test.test_import.data.lazy_imports.basic2", sys.modules)
self.assertNotIn("test.test_lazy_import.data.basic2", sys.modules)
x = basic_unused.test.test_lazy_import.data.basic2
self.assertIn("test.test_lazy_import.data.basic2", sys.modules)
def test_basic_from_unused_use_externally(self):
"""Lazy 'from' import should load when accessed from outside."""
from test.test_import.data.lazy_imports import basic_from_unused
from test.test_lazy_import.data import basic_from_unused
self.assertNotIn("test.test_import.data.lazy_imports.basic2", sys.modules)
self.assertNotIn("test.test_lazy_import.data.basic2", sys.modules)
x = basic_from_unused.basic2
self.assertIn("test.test_import.data.lazy_imports.basic2", sys.modules)
self.assertIn("test.test_lazy_import.data.basic2", sys.modules)
def test_basic_unused_dir(self):
"""dir() on module should not trigger lazy import reification."""
import test.test_import.data.lazy_imports.basic_unused
import test.test_lazy_import.data.basic_unused
x = dir(test.test_import.data.lazy_imports.basic_unused)
x = dir(test.test_lazy_import.data.basic_unused)
self.assertIn("test", x)
self.assertNotIn("test.test_import.data.lazy_imports.basic2", sys.modules)
self.assertNotIn("test.test_lazy_import.data.basic2", sys.modules)
def test_basic_dir(self):
"""dir() at module scope should not trigger lazy import reification."""
from test.test_import.data.lazy_imports import basic_dir
from test.test_lazy_import.data import basic_dir
self.assertIn("test", basic_dir.x)
self.assertNotIn("test.test_import.data.lazy_imports.basic2", sys.modules)
self.assertNotIn("test.test_lazy_import.data.basic2", sys.modules)
def test_basic_used(self):
"""Lazy import should load when accessed within the module."""
import test.test_import.data.lazy_imports.basic_used
self.assertIn("test.test_import.data.lazy_imports.basic2", sys.modules)
import test.test_lazy_import.data.basic_used
self.assertIn("test.test_lazy_import.data.basic2", sys.modules)
class GlobalLazyImportModeTests(unittest.TestCase):
@@ -91,7 +93,7 @@ class GlobalLazyImportModeTests(unittest.TestCase):
def tearDown(self):
for key in list(sys.modules.keys()):
if key.startswith('test.test_import.data.lazy_imports'):
if key.startswith('test.test_lazy_import.data'):
del sys.modules[key]
sys.set_lazy_imports_filter(None)
@@ -99,33 +101,33 @@ class GlobalLazyImportModeTests(unittest.TestCase):
def test_global_off(self):
"""Mode 'none' should disable lazy imports entirely."""
import test.test_import.data.lazy_imports.global_off
self.assertIn("test.test_import.data.lazy_imports.basic2", sys.modules)
import test.test_lazy_import.data.global_off
self.assertIn("test.test_lazy_import.data.basic2", sys.modules)
def test_global_on(self):
"""Mode 'all' should make regular imports lazy."""
import test.test_import.data.lazy_imports.global_on
self.assertNotIn("test.test_import.data.lazy_imports.basic2", sys.modules)
import test.test_lazy_import.data.global_on
self.assertNotIn("test.test_lazy_import.data.basic2", sys.modules)
def test_global_filter(self):
"""Filter returning False should prevent lazy loading."""
import test.test_import.data.lazy_imports.global_filter
self.assertIn("test.test_import.data.lazy_imports.basic2", sys.modules)
import test.test_lazy_import.data.global_filter
self.assertIn("test.test_lazy_import.data.basic2", sys.modules)
def test_global_filter_true(self):
"""Filter returning True should allow lazy loading."""
import test.test_import.data.lazy_imports.global_filter_true
self.assertNotIn("test.test_import.data.lazy_imports.basic2", sys.modules)
import test.test_lazy_import.data.global_filter_true
self.assertNotIn("test.test_lazy_import.data.basic2", sys.modules)
def test_global_filter_from(self):
"""Filter should work with 'from' imports."""
import test.test_import.data.lazy_imports.global_filter_from
self.assertIn("test.test_import.data.lazy_imports.basic2", sys.modules)
import test.test_lazy_import.data.global_filter_from
self.assertIn("test.test_lazy_import.data.basic2", sys.modules)
def test_global_filter_from_true(self):
"""Filter returning True should allow lazy 'from' imports."""
import test.test_import.data.lazy_imports.global_filter_from_true
self.assertNotIn("test.test_import.data.lazy_imports.basic2", sys.modules)
import test.test_lazy_import.data.global_filter_from_true
self.assertNotIn("test.test_lazy_import.data.basic2", sys.modules)
class CompatibilityModeTests(unittest.TestCase):
@@ -133,7 +135,7 @@ class CompatibilityModeTests(unittest.TestCase):
def tearDown(self):
for key in list(sys.modules.keys()):
if key.startswith('test.test_import.data.lazy_imports'):
if key.startswith('test.test_lazy_import.data'):
del sys.modules[key]
sys.set_lazy_imports_filter(None)
@@ -141,28 +143,28 @@ class CompatibilityModeTests(unittest.TestCase):
def test_compatibility_mode(self):
"""__lazy_modules__ should enable lazy imports for listed modules."""
import test.test_import.data.lazy_imports.basic_compatibility_mode
self.assertNotIn("test.test_import.data.lazy_imports.basic2", sys.modules)
import test.test_lazy_import.data.basic_compatibility_mode
self.assertNotIn("test.test_lazy_import.data.basic2", sys.modules)
def test_compatibility_mode_used(self):
"""Using a lazy import from __lazy_modules__ should load the module."""
import test.test_import.data.lazy_imports.basic_compatibility_mode_used
self.assertIn("test.test_import.data.lazy_imports.basic2", sys.modules)
import test.test_lazy_import.data.basic_compatibility_mode_used
self.assertIn("test.test_lazy_import.data.basic2", sys.modules)
def test_compatibility_mode_func(self):
"""Imports inside functions should be eager even in compatibility mode."""
import test.test_import.data.lazy_imports.compatibility_mode_func
self.assertIn("test.test_import.data.lazy_imports.basic2", sys.modules)
import test.test_lazy_import.data.compatibility_mode_func
self.assertIn("test.test_lazy_import.data.basic2", sys.modules)
def test_compatibility_mode_try_except(self):
"""Imports in try/except should be eager even in compatibility mode."""
import test.test_import.data.lazy_imports.compatibility_mode_try_except
self.assertIn("test.test_import.data.lazy_imports.basic2", sys.modules)
import test.test_lazy_import.data.compatibility_mode_try_except
self.assertIn("test.test_lazy_import.data.basic2", sys.modules)
def test_compatibility_mode_relative(self):
"""__lazy_modules__ should work with relative imports."""
import test.test_import.data.lazy_imports.basic_compatibility_mode_relative
self.assertNotIn("test.test_import.data.lazy_imports.basic2", sys.modules)
import test.test_lazy_import.data.basic_compatibility_mode_relative
self.assertNotIn("test.test_lazy_import.data.basic2", sys.modules)
class ModuleIntrospectionTests(unittest.TestCase):
@@ -170,7 +172,7 @@ class ModuleIntrospectionTests(unittest.TestCase):
def tearDown(self):
for key in list(sys.modules.keys()):
if key.startswith('test.test_import.data.lazy_imports'):
if key.startswith('test.test_lazy_import.data'):
del sys.modules[key]
sys.set_lazy_imports_filter(None)
@@ -178,18 +180,18 @@ class ModuleIntrospectionTests(unittest.TestCase):
def test_modules_dict(self):
"""Accessing module.__dict__ should not trigger reification."""
import test.test_import.data.lazy_imports.modules_dict
self.assertNotIn("test.test_import.data.lazy_imports.basic2", sys.modules)
import test.test_lazy_import.data.modules_dict
self.assertNotIn("test.test_lazy_import.data.basic2", sys.modules)
def test_modules_getattr(self):
"""Module __getattr__ for lazy import name should trigger reification."""
import test.test_import.data.lazy_imports.modules_getattr
self.assertIn("test.test_import.data.lazy_imports.basic2", sys.modules)
import test.test_lazy_import.data.modules_getattr
self.assertIn("test.test_lazy_import.data.basic2", sys.modules)
def test_modules_getattr_other(self):
"""Module __getattr__ for other names should not trigger reification."""
import test.test_import.data.lazy_imports.modules_getattr_other
self.assertNotIn("test.test_import.data.lazy_imports.basic2", sys.modules)
import test.test_lazy_import.data.modules_getattr_other
self.assertNotIn("test.test_lazy_import.data.basic2", sys.modules)
class LazyImportTypeTests(unittest.TestCase):
@@ -197,7 +199,7 @@ class LazyImportTypeTests(unittest.TestCase):
def tearDown(self):
for key in list(sys.modules.keys()):
if key.startswith('test.test_import.data.lazy_imports'):
if key.startswith('test.test_lazy_import.data'):
del sys.modules[key]
sys.set_lazy_imports_filter(None)
@@ -205,8 +207,8 @@ class LazyImportTypeTests(unittest.TestCase):
def test_lazy_value_resolve(self):
"""resolve() method should force the lazy import to load."""
import test.test_import.data.lazy_imports.lazy_get_value
self.assertIn("test.test_import.data.lazy_imports.basic2", sys.modules)
import test.test_lazy_import.data.lazy_get_value
self.assertIn("test.test_lazy_import.data.basic2", sys.modules)
def test_lazy_import_type_exposed(self):
"""LazyImportType should be exposed in types module."""
@@ -223,7 +225,7 @@ class SyntaxRestrictionTests(unittest.TestCase):
def tearDown(self):
for key in list(sys.modules.keys()):
if key.startswith('test.test_import.data.lazy_imports'):
if key.startswith('test.test_lazy_import.data'):
del sys.modules[key]
sys.set_lazy_imports_filter(None)
@@ -232,22 +234,22 @@ class SyntaxRestrictionTests(unittest.TestCase):
def test_lazy_try_except(self):
"""lazy import inside try/except should raise SyntaxError."""
with self.assertRaises(SyntaxError):
import test.test_import.data.lazy_imports.badsyntax.lazy_try_except
import test.test_lazy_import.data.badsyntax.lazy_try_except
def test_lazy_try_except_from(self):
"""lazy from import inside try/except should raise SyntaxError."""
with self.assertRaises(SyntaxError):
import test.test_import.data.lazy_imports.badsyntax.lazy_try_except_from
import test.test_lazy_import.data.badsyntax.lazy_try_except_from
def test_lazy_try_except_from_star(self):
"""lazy from import * should raise SyntaxError."""
with self.assertRaises(SyntaxError):
import test.test_import.data.lazy_imports.badsyntax.lazy_try_except_from_star
import test.test_lazy_import.data.badsyntax.lazy_try_except_from_star
def test_lazy_future_import(self):
"""lazy from __future__ import should raise SyntaxError."""
with self.assertRaises(SyntaxError) as cm:
import test.test_import.data.lazy_imports.badsyntax.lazy_future_import
import test.test_lazy_import.data.badsyntax.lazy_future_import
# Check we highlight 'lazy' (column offset 0, end offset 4)
self.assertEqual(cm.exception.offset, 1)
self.assertEqual(cm.exception.end_offset, 5)
@@ -255,7 +257,7 @@ class SyntaxRestrictionTests(unittest.TestCase):
def test_lazy_import_func(self):
"""lazy import inside function should raise SyntaxError."""
with self.assertRaises(SyntaxError):
import test.test_import.data.lazy_imports.badsyntax.lazy_import_func
import test.test_lazy_import.data.badsyntax.lazy_import_func
def test_lazy_import_exec_in_function(self):
"""lazy import via exec() inside a function should raise SyntaxError."""
@@ -268,6 +270,7 @@ class SyntaxRestrictionTests(unittest.TestCase):
f()
self.assertIn("only allowed at module level", str(cm.exception))
@support.requires_subprocess()
def test_lazy_import_exec_at_module_level(self):
"""lazy import via exec() at module level should work."""
# exec() at module level (globals == locals) should allow lazy imports
@@ -292,7 +295,7 @@ class EagerImportInLazyModeTests(unittest.TestCase):
def tearDown(self):
for key in list(sys.modules.keys()):
if key.startswith('test.test_import.data.lazy_imports'):
if key.startswith('test.test_lazy_import.data'):
del sys.modules[key]
sys.set_lazy_imports_filter(None)
@@ -301,21 +304,21 @@ class EagerImportInLazyModeTests(unittest.TestCase):
def test_try_except_eager(self):
"""Imports in try/except should be eager even with mode='all'."""
sys.set_lazy_imports("all")
import test.test_import.data.lazy_imports.try_except_eager
self.assertIn("test.test_import.data.lazy_imports.basic2", sys.modules)
import test.test_lazy_import.data.try_except_eager
self.assertIn("test.test_lazy_import.data.basic2", sys.modules)
def test_try_except_eager_from(self):
"""From imports in try/except should be eager even with mode='all'."""
sys.set_lazy_imports("all")
import test.test_import.data.lazy_imports.try_except_eager_from
self.assertIn("test.test_import.data.lazy_imports.basic2", sys.modules)
import test.test_lazy_import.data.try_except_eager_from
self.assertIn("test.test_lazy_import.data.basic2", sys.modules)
def test_eager_import_func(self):
"""Imports inside functions should return modules, not proxies."""
sys.set_lazy_imports("all")
import test.test_import.data.lazy_imports.eager_import_func
import test.test_lazy_import.data.eager_import_func
f = test.test_import.data.lazy_imports.eager_import_func.f
f = test.test_lazy_import.data.eager_import_func.f
self.assertEqual(type(f()), type(sys))
@@ -324,7 +327,7 @@ class WithStatementTests(unittest.TestCase):
def tearDown(self):
for key in list(sys.modules.keys()):
if key.startswith('test.test_import.data.lazy_imports'):
if key.startswith('test.test_lazy_import.data'):
del sys.modules[key]
sys.set_lazy_imports_filter(None)
@@ -332,13 +335,13 @@ class WithStatementTests(unittest.TestCase):
def test_lazy_with(self):
"""lazy import with 'with' statement should work."""
import test.test_import.data.lazy_imports.lazy_with
self.assertNotIn("test.test_import.data.lazy_imports.basic2", sys.modules)
import test.test_lazy_import.data.lazy_with
self.assertNotIn("test.test_lazy_import.data.basic2", sys.modules)
def test_lazy_with_from(self):
"""lazy from import with 'with' statement should work."""
import test.test_import.data.lazy_imports.lazy_with_from
self.assertNotIn("test.test_import.data.lazy_imports.basic2", sys.modules)
import test.test_lazy_import.data.lazy_with_from
self.assertNotIn("test.test_lazy_import.data.basic2", sys.modules)
class PackageTests(unittest.TestCase):
@@ -346,7 +349,7 @@ class PackageTests(unittest.TestCase):
def tearDown(self):
for key in list(sys.modules.keys()):
if key.startswith('test.test_import.data.lazy_imports'):
if key.startswith('test.test_lazy_import.data'):
del sys.modules[key]
sys.set_lazy_imports_filter(None)
@@ -354,20 +357,20 @@ class PackageTests(unittest.TestCase):
def test_lazy_import_pkg(self):
"""lazy import of package submodule should load the package."""
import test.test_import.data.lazy_imports.lazy_import_pkg
import test.test_lazy_import.data.lazy_import_pkg
self.assertIn("test.test_import.data.lazy_imports.pkg", sys.modules)
self.assertIn("test.test_import.data.lazy_imports.pkg.bar", sys.modules)
self.assertIn("test.test_lazy_import.data.pkg", sys.modules)
self.assertIn("test.test_lazy_import.data.pkg.bar", sys.modules)
def test_lazy_import_pkg_cross_import(self):
"""Cross-imports within package should preserve lazy imports."""
import test.test_import.data.lazy_imports.pkg.c
import test.test_lazy_import.data.pkg.c
self.assertIn("test.test_import.data.lazy_imports.pkg", sys.modules)
self.assertIn("test.test_import.data.lazy_imports.pkg.c", sys.modules)
self.assertNotIn("test.test_import.data.lazy_imports.pkg.b", sys.modules)
self.assertIn("test.test_lazy_import.data.pkg", sys.modules)
self.assertIn("test.test_lazy_import.data.pkg.c", sys.modules)
self.assertNotIn("test.test_lazy_import.data.pkg.b", sys.modules)
g = test.test_import.data.lazy_imports.pkg.c.get_globals()
g = test.test_lazy_import.data.pkg.c.get_globals()
self.assertEqual(type(g["x"]), int)
self.assertEqual(type(g["b"]), types.LazyImportType)
@@ -377,7 +380,7 @@ class DunderLazyImportTests(unittest.TestCase):
def tearDown(self):
for key in list(sys.modules.keys()):
if key.startswith('test.test_import.data.lazy_imports'):
if key.startswith('test.test_lazy_import.data'):
del sys.modules[key]
sys.set_lazy_imports_filter(None)
@@ -385,13 +388,13 @@ class DunderLazyImportTests(unittest.TestCase):
def test_dunder_lazy_import(self):
"""__lazy_import__ should create lazy import proxy."""
import test.test_import.data.lazy_imports.dunder_lazy_import
self.assertNotIn("test.test_import.data.lazy_imports.basic2", sys.modules)
import test.test_lazy_import.data.dunder_lazy_import
self.assertNotIn("test.test_lazy_import.data.basic2", sys.modules)
def test_dunder_lazy_import_used(self):
"""Using __lazy_import__ result should trigger module load."""
import test.test_import.data.lazy_imports.dunder_lazy_import_used
self.assertIn("test.test_import.data.lazy_imports.basic2", sys.modules)
import test.test_lazy_import.data.dunder_lazy_import_used
self.assertIn("test.test_lazy_import.data.basic2", sys.modules)
def test_dunder_lazy_import_invalid_arguments(self):
"""__lazy_import__ should reject invalid arguments."""
@@ -406,9 +409,9 @@ class DunderLazyImportTests(unittest.TestCase):
def test_dunder_lazy_import_builtins(self):
"""__lazy_import__ should use module's __builtins__ for __import__."""
from test.test_import.data.lazy_imports import dunder_lazy_import_builtins
from test.test_lazy_import.data import dunder_lazy_import_builtins
self.assertNotIn("test.test_import.data.lazy_imports.basic2", sys.modules)
self.assertNotIn("test.test_lazy_import.data.basic2", sys.modules)
self.assertEqual(dunder_lazy_import_builtins.basic.basic2, 42)
@@ -417,7 +420,7 @@ class SysLazyImportsAPITests(unittest.TestCase):
def tearDown(self):
for key in list(sys.modules.keys()):
if key.startswith('test.test_import.data.lazy_imports'):
if key.startswith('test.test_lazy_import.data'):
del sys.modules[key]
sys.set_lazy_imports_filter(None)
@@ -469,14 +472,15 @@ class SysLazyImportsAPITests(unittest.TestCase):
"""sys.lazy_modules should be a set per PEP 810."""
self.assertIsInstance(sys.lazy_modules, dict)
@support.requires_subprocess()
def test_lazy_modules_tracks_lazy_imports(self):
"""sys.lazy_modules should track lazily imported module names."""
code = textwrap.dedent("""
import sys
initial_count = len(sys.lazy_modules)
import test.test_import.data.lazy_imports.basic_unused
assert "test.test_import.data.lazy_imports" in sys.lazy_modules
assert sys.lazy_modules["test.test_import.data.lazy_imports"] == {"basic2"}
import test.test_lazy_import.data.basic_unused
assert "test.test_lazy_import.data" in sys.lazy_modules
assert sys.lazy_modules["test.test_lazy_import.data"] == {"basic2"}
assert len(sys.lazy_modules) > initial_count
print("OK")
""")
@@ -489,6 +493,7 @@ class SysLazyImportsAPITests(unittest.TestCase):
self.assertIn("OK", result.stdout)
@support.requires_subprocess()
class ErrorHandlingTests(unittest.TestCase):
"""Tests for error handling during lazy import reification.
@@ -498,7 +503,7 @@ class ErrorHandlingTests(unittest.TestCase):
def tearDown(self):
for key in list(sys.modules.keys()):
if key.startswith('test.test_import.data.lazy_imports'):
if key.startswith('test.test_lazy_import.data'):
del sys.modules[key]
sys.set_lazy_imports_filter(None)
@@ -510,10 +515,10 @@ class ErrorHandlingTests(unittest.TestCase):
# AND where the access happened, per PEP 810 "Reification" section
code = textwrap.dedent("""
import sys
lazy import test.test_import.data.lazy_imports.nonexistent_module
lazy import test.test_lazy_import.data.nonexistent_module
try:
x = test.test_import.data.lazy_imports.nonexistent_module
x = test.test_lazy_import.data.nonexistent_module
except ImportError as e:
# Should have __cause__ showing the original error
# The exception chain shows both where import was defined and where access happened
@@ -533,7 +538,7 @@ class ErrorHandlingTests(unittest.TestCase):
# Tests 'lazy from module import nonexistent' behavior
code = textwrap.dedent("""
import sys
lazy from test.test_import.data.lazy_imports.basic2 import nonexistent_name
lazy from test.test_lazy_import.data.basic2 import nonexistent_name
try:
x = nonexistent_name
@@ -560,11 +565,11 @@ class ErrorHandlingTests(unittest.TestCase):
import sys
import types
lazy import test.test_import.data.lazy_imports.broken_module
lazy import test.test_lazy_import.data.broken_module
# First access - should fail
try:
x = test.test_import.data.lazy_imports.broken_module
x = test.test_lazy_import.data.broken_module
except ValueError:
pass
@@ -574,7 +579,7 @@ class ErrorHandlingTests(unittest.TestCase):
# The root 'test' binding should still allow retry
# Second access - should also fail (retry the import)
try:
x = test.test_import.data.lazy_imports.broken_module
x = test.test_lazy_import.data.broken_module
except ValueError:
print("OK - retry worked")
""")
@@ -591,10 +596,10 @@ class ErrorHandlingTests(unittest.TestCase):
# Module that raises during import should propagate with chaining
code = textwrap.dedent("""
import sys
lazy import test.test_import.data.lazy_imports.broken_module
lazy import test.test_lazy_import.data.broken_module
try:
_ = test.test_import.data.lazy_imports.broken_module
_ = test.test_lazy_import.data.broken_module
print("FAIL - should have raised")
except ValueError as e:
# The ValueError from the module should be the cause
@@ -645,6 +650,7 @@ class ErrorHandlingTests(unittest.TestCase):
self.assertIn("Error", result.stderr)
@support.requires_subprocess()
class GlobalsAndDictTests(unittest.TestCase):
"""Tests for globals() and __dict__ behavior with lazy imports.
@@ -655,7 +661,7 @@ class GlobalsAndDictTests(unittest.TestCase):
def tearDown(self):
for key in list(sys.modules.keys()):
if key.startswith('test.test_import.data.lazy_imports'):
if key.startswith('test.test_lazy_import.data'):
del sys.modules[key]
sys.set_lazy_imports_filter(None)
@@ -672,10 +678,10 @@ class GlobalsAndDictTests(unittest.TestCase):
import sys
import types
lazy from test.test_import.data.lazy_imports.basic2 import x
lazy from test.test_lazy_import.data.basic2 import x
# Check that module is not yet loaded
assert 'test.test_import.data.lazy_imports.basic2' not in sys.modules
assert 'test.test_lazy_import.data.basic2' not in sys.modules
def check_lazy():
# Access through globals() from inside a function
@@ -688,7 +694,7 @@ class GlobalsAndDictTests(unittest.TestCase):
assert is_lazy, "Expected LazyImportType from function scope"
# Module should STILL not be loaded
assert 'test.test_import.data.lazy_imports.basic2' not in sys.modules
assert 'test.test_lazy_import.data.basic2' not in sys.modules
print("OK")
""")
result = subprocess.run(
@@ -724,25 +730,25 @@ class GlobalsAndDictTests(unittest.TestCase):
def test_module_dict_returns_lazy_proxy_without_reifying(self):
"""module.__dict__ access should not trigger reification."""
import test.test_import.data.lazy_imports.globals_access
import test.test_lazy_import.data.globals_access
# Module not loaded yet via direct dict access
self.assertNotIn("test.test_import.data.lazy_imports.basic2", sys.modules)
self.assertNotIn("test.test_lazy_import.data.basic2", sys.modules)
# Access via get_from_globals should return lazy proxy
lazy_obj = test.test_import.data.lazy_imports.globals_access.get_from_globals()
lazy_obj = test.test_lazy_import.data.globals_access.get_from_globals()
self.assertEqual(type(lazy_obj), types.LazyImportType)
self.assertNotIn("test.test_import.data.lazy_imports.basic2", sys.modules)
self.assertNotIn("test.test_lazy_import.data.basic2", sys.modules)
def test_direct_access_triggers_reification(self):
"""Direct name access (not through globals()) should trigger reification."""
import test.test_import.data.lazy_imports.globals_access
import test.test_lazy_import.data.globals_access
self.assertNotIn("test.test_import.data.lazy_imports.basic2", sys.modules)
self.assertNotIn("test.test_lazy_import.data.basic2", sys.modules)
# Direct access should reify
result = test.test_import.data.lazy_imports.globals_access.get_direct()
self.assertIn("test.test_import.data.lazy_imports.basic2", sys.modules)
result = test.test_lazy_import.data.globals_access.get_direct()
self.assertIn("test.test_lazy_import.data.basic2", sys.modules)
def test_resolve_method_forces_reification(self):
"""Calling resolve() on lazy proxy should force reification.
@@ -754,9 +760,9 @@ class GlobalsAndDictTests(unittest.TestCase):
import sys
import types
lazy from test.test_import.data.lazy_imports.basic2 import x
lazy from test.test_lazy_import.data.basic2 import x
assert 'test.test_import.data.lazy_imports.basic2' not in sys.modules
assert 'test.test_lazy_import.data.basic2' not in sys.modules
def test_resolve():
g = globals()
@@ -766,7 +772,7 @@ class GlobalsAndDictTests(unittest.TestCase):
resolved = lazy_obj.resolve()
# Now module should be loaded
assert 'test.test_import.data.lazy_imports.basic2' in sys.modules
assert 'test.test_lazy_import.data.basic2' in sys.modules
assert resolved == 42 # x is 42 in basic2.py
return True
@@ -786,9 +792,9 @@ class GlobalsAndDictTests(unittest.TestCase):
import sys
import types
lazy from test.test_import.data.lazy_imports import basic2
lazy from test.test_lazy_import.data import basic2
assert 'test.test_import.data.lazy_imports.basic2' not in sys.modules
assert 'test.test_lazy_import.data.basic2' not in sys.modules
class C: pass
sneaky = C()
@@ -814,6 +820,7 @@ class GlobalsAndDictTests(unittest.TestCase):
self.assertIn("OK", result.stdout)
@support.requires_subprocess()
class MultipleNameFromImportTests(unittest.TestCase):
"""Tests for lazy from ... import with multiple names.
@@ -825,7 +832,7 @@ class MultipleNameFromImportTests(unittest.TestCase):
def tearDown(self):
for key in list(sys.modules.keys()):
if key.startswith('test.test_import.data.lazy_imports'):
if key.startswith('test.test_lazy_import.data'):
del sys.modules[key]
sys.set_lazy_imports_filter(None)
@@ -837,10 +844,10 @@ class MultipleNameFromImportTests(unittest.TestCase):
import sys
import types
lazy from test.test_import.data.lazy_imports.basic2 import f, x
lazy from test.test_lazy_import.data.basic2 import f, x
# Neither should be loaded yet
assert 'test.test_import.data.lazy_imports.basic2' not in sys.modules
assert 'test.test_lazy_import.data.basic2' not in sys.modules
g = globals()
assert type(g['f']) is types.LazyImportType
@@ -851,7 +858,7 @@ class MultipleNameFromImportTests(unittest.TestCase):
assert value == 42
# Module is now loaded
assert 'test.test_import.data.lazy_imports.basic2' in sys.modules
assert 'test.test_lazy_import.data.basic2' in sys.modules
# 'x' should be reified (int), 'f' should still be lazy proxy
assert type(g['x']) is int, f"Expected int, got {type(g['x'])}"
@@ -872,7 +879,7 @@ class MultipleNameFromImportTests(unittest.TestCase):
import sys
import types
lazy from test.test_import.data.lazy_imports.basic2 import f, x
lazy from test.test_lazy_import.data.basic2 import f, x
g = globals()
@@ -894,6 +901,7 @@ class MultipleNameFromImportTests(unittest.TestCase):
self.assertIn("OK", result.stdout)
@support.requires_subprocess()
class SysLazyModulesTrackingTests(unittest.TestCase):
"""Tests for sys.lazy_modules tracking behavior.
@@ -902,7 +910,7 @@ class SysLazyModulesTrackingTests(unittest.TestCase):
def tearDown(self):
for key in list(sys.modules.keys()):
if key.startswith('test.test_import.data.lazy_imports'):
if key.startswith('test.test_lazy_import.data'):
del sys.modules[key]
sys.set_lazy_imports_filter(None)
@@ -918,18 +926,18 @@ class SysLazyModulesTrackingTests(unittest.TestCase):
initial_count = len(sys.lazy_modules)
lazy import test.test_import.data.lazy_imports.basic2
lazy import test.test_lazy_import.data.basic2
# Should be in lazy_modules after lazy import
assert "test.test_import.data.lazy_imports" in sys.lazy_modules
assert sys.lazy_modules["test.test_import.data.lazy_imports"] == {"basic2"}
assert "test.test_lazy_import.data" in sys.lazy_modules
assert sys.lazy_modules["test.test_lazy_import.data"] == {"basic2"}
assert len(sys.lazy_modules) > initial_count
# Trigger reification
_ = test.test_import.data.lazy_imports.basic2.x
_ = test.test_lazy_import.data.basic2.x
# Module should still be tracked (for diagnostics per PEP 810)
assert "test.test_import.data.lazy_imports" not in sys.lazy_modules
assert "test.test_lazy_import.data" not in sys.lazy_modules
print("OK")
""")
result = subprocess.run(
@@ -946,6 +954,7 @@ class SysLazyModulesTrackingTests(unittest.TestCase):
self.assertIsInstance(sys.lazy_modules, dict)
@support.requires_subprocess()
class CommandLineAndEnvVarTests(unittest.TestCase):
"""Tests for command-line and environment variable control.
@@ -1000,11 +1009,11 @@ class CommandLineAndEnvVarTests(unittest.TestCase):
# modules already loaded by the interpreter startup
code = textwrap.dedent("""
import sys
import test.test_import.data.lazy_imports.basic2 # Should be eager
lazy import test.test_import.data.lazy_imports.pkg.b # Should be lazy
import test.test_lazy_import.data.basic2 # Should be eager
lazy import test.test_lazy_import.data.pkg.b # Should be lazy
eager_loaded = 'test.test_import.data.lazy_imports.basic2' in sys.modules
lazy_loaded = 'test.test_import.data.lazy_imports.pkg.b' in sys.modules
eager_loaded = 'test.test_lazy_import.data.basic2' in sys.modules
lazy_loaded = 'test.test_lazy_import.data.pkg.b' in sys.modules
if eager_loaded and not lazy_loaded:
print("OK")
@@ -1107,6 +1116,7 @@ class CommandLineAndEnvVarTests(unittest.TestCase):
self.assertIn("EAGER", result.stdout)
@support.requires_subprocess()
class FilterFunctionSignatureTests(unittest.TestCase):
"""Tests for the filter function signature per PEP 810.
@@ -1115,7 +1125,7 @@ class FilterFunctionSignatureTests(unittest.TestCase):
def tearDown(self):
for key in list(sys.modules.keys()):
if key.startswith('test.test_import.data.lazy_imports'):
if key.startswith('test.test_lazy_import.data'):
del sys.modules[key]
sys.set_lazy_imports_filter(None)
@@ -1212,7 +1222,7 @@ class AdditionalSyntaxRestrictionTests(unittest.TestCase):
def tearDown(self):
for key in list(sys.modules.keys()):
if key.startswith('test.test_import.data.lazy_imports'):
if key.startswith('test.test_lazy_import.data'):
del sys.modules[key]
sys.set_lazy_imports_filter(None)
@@ -1223,9 +1233,10 @@ class AdditionalSyntaxRestrictionTests(unittest.TestCase):
# PEP 810: "The soft keyword is only allowed at the global (module) level,
# not inside functions, class bodies, try blocks, or import *"
with self.assertRaises(SyntaxError):
import test.test_import.data.lazy_imports.badsyntax.lazy_class_body
import test.test_lazy_import.data.badsyntax.lazy_class_body
@support.requires_subprocess()
class MixedLazyEagerImportTests(unittest.TestCase):
"""Tests for mixing lazy and eager imports of the same module.
@@ -1236,7 +1247,7 @@ class MixedLazyEagerImportTests(unittest.TestCase):
def tearDown(self):
for key in list(sys.modules.keys()):
if key.startswith('test.test_import.data.lazy_imports'):
if key.startswith('test.test_lazy_import.data'):
del sys.modules[key]
sys.set_lazy_imports_filter(None)
@@ -1292,7 +1303,7 @@ class RelativeImportTests(unittest.TestCase):
def tearDown(self):
for key in list(sys.modules.keys()):
if key.startswith('test.test_import.data.lazy_imports'):
if key.startswith('test.test_lazy_import.data'):
del sys.modules[key]
sys.set_lazy_imports_filter(None)
@@ -1300,26 +1311,26 @@ class RelativeImportTests(unittest.TestCase):
def test_relative_lazy_import(self):
"""lazy from . import submodule should work."""
from test.test_import.data.lazy_imports import relative_lazy
from test.test_lazy_import.data import relative_lazy
# basic2 should not be loaded yet
self.assertNotIn("test.test_import.data.lazy_imports.basic2", sys.modules)
self.assertNotIn("test.test_lazy_import.data.basic2", sys.modules)
# Access triggers reification
result = relative_lazy.get_basic2()
self.assertIn("test.test_import.data.lazy_imports.basic2", sys.modules)
self.assertIn("test.test_lazy_import.data.basic2", sys.modules)
def test_relative_lazy_from_import(self):
"""lazy from .module import name should work."""
from test.test_import.data.lazy_imports import relative_lazy_from
from test.test_lazy_import.data import relative_lazy_from
# basic2 should not be loaded yet
self.assertNotIn("test.test_import.data.lazy_imports.basic2", sys.modules)
self.assertNotIn("test.test_lazy_import.data.basic2", sys.modules)
# Access triggers reification
result = relative_lazy_from.get_x()
self.assertEqual(result, 42)
self.assertIn("test.test_import.data.lazy_imports.basic2", sys.modules)
self.assertIn("test.test_lazy_import.data.basic2", sys.modules)
class LazyModulesCompatibilityFromImportTests(unittest.TestCase):
@@ -1331,7 +1342,7 @@ class LazyModulesCompatibilityFromImportTests(unittest.TestCase):
def tearDown(self):
for key in list(sys.modules.keys()):
if key.startswith('test.test_import.data.lazy_imports'):
if key.startswith('test.test_lazy_import.data'):
del sys.modules[key]
sys.set_lazy_imports_filter(None)
@@ -1339,17 +1350,18 @@ class LazyModulesCompatibilityFromImportTests(unittest.TestCase):
def test_lazy_modules_makes_from_imports_lazy(self):
"""__lazy_modules__ should make from imports of listed modules lazy."""
from test.test_import.data.lazy_imports import lazy_compat_from
from test.test_lazy_import.data import lazy_compat_from
# basic2 should not be loaded yet because it's in __lazy_modules__
self.assertNotIn("test.test_import.data.lazy_imports.basic2", sys.modules)
self.assertNotIn("test.test_lazy_import.data.basic2", sys.modules)
# Access triggers reification
result = lazy_compat_from.get_x()
self.assertEqual(result, 42)
self.assertIn("test.test_import.data.lazy_imports.basic2", sys.modules)
self.assertIn("test.test_lazy_import.data.basic2", sys.modules)
@support.requires_subprocess()
class ImportStateAtReificationTests(unittest.TestCase):
"""Tests for import system state at reification time.
@@ -1361,7 +1373,7 @@ class ImportStateAtReificationTests(unittest.TestCase):
def tearDown(self):
for key in list(sys.modules.keys()):
if key.startswith('test.test_import.data.lazy_imports'):
if key.startswith('test.test_lazy_import.data'):
del sys.modules[key]
sys.set_lazy_imports_filter(None)
@@ -1408,12 +1420,13 @@ class ImportStateAtReificationTests(unittest.TestCase):
self.assertIn("OK", result.stdout)
@support.requires_subprocess()
class ThreadSafetyTests(unittest.TestCase):
"""Tests for thread-safety of lazy imports."""
def tearDown(self):
for key in list(sys.modules.keys()):
if key.startswith('test.test_import.data.lazy_imports'):
if key.startswith('test.test_lazy_import.data'):
del sys.modules[key]
sys.set_lazy_imports_filter(None)
@@ -1421,7 +1434,7 @@ class ThreadSafetyTests(unittest.TestCase):
def test_concurrent_lazy_import_reification(self):
"""Multiple threads racing to reify the same lazy import should succeed."""
from test.test_import.data.lazy_imports import basic_unused
from test.test_lazy_import.data import basic_unused
num_threads = 10
results = [None] * num_threads
@@ -1431,7 +1444,7 @@ class ThreadSafetyTests(unittest.TestCase):
def access_lazy_import(idx):
try:
barrier.wait()
module = basic_unused.test.test_import.data.lazy_imports.basic2
module = basic_unused.test.test_lazy_import.data.basic2
results[idx] = module
except Exception as e:
errors.append((idx, e))
@@ -0,0 +1,2 @@
__lazy_modules__ = ['test.test_lazy_import.data.basic2']
import test.test_lazy_import.data.basic2
@@ -0,0 +1,2 @@
__lazy_modules__ = ['test.test_lazy_import.data.basic2']
lazy from .basic2 import f
@@ -0,0 +1,3 @@
__lazy_modules__ = ['test.test_lazy_import.data.basic2']
import test.test_lazy_import.data.basic2
test.test_lazy_import.data.basic2.f()
@@ -0,0 +1,2 @@
lazy import test.test_lazy_import.data.basic2
x = dir()
@@ -0,0 +1 @@
lazy from test.test_lazy_import.data import basic2
@@ -0,0 +1 @@
lazy import test.test_lazy_import.data.basic2
@@ -0,0 +1,3 @@
lazy import test.test_lazy_import.data.basic2 as basic2
basic2.f()
@@ -0,0 +1,5 @@
__lazy_modules__ = ['test.test_lazy_import.data.basic2']
def f():
import test.test_lazy_import.data.basic2
f()
@@ -0,0 +1,5 @@
__lazy_modules__ = ['test.test_lazy_import.data.basic2']
try:
import test.test_lazy_import.data.basic2
except:
pass
@@ -0,0 +1 @@
basic = __lazy_import__('test.test_lazy_import.data.basic2')
@@ -9,6 +9,6 @@ new_globals["__builtins__"] = {
"__import__": myimport,
}
basic2 = 42
basic = __lazy_import__("test.test_import.data.lazy_imports.basic2",
basic = __lazy_import__("test.test_lazy_import.data.basic2",
globals=new_globals)
basic
@@ -0,0 +1,3 @@
basic = __lazy_import__('test.test_lazy_import.data',
fromlist=("basic2", ))
basic
@@ -0,0 +1,3 @@
def f():
import test.test_lazy_import.data.basic2 as basic2
return basic2
@@ -2,9 +2,9 @@ import sys
def filter(module_name, imported_name, from_list):
assert module_name == __name__
assert imported_name == "test.test_import.data.lazy_imports.basic2"
assert imported_name == "test.test_lazy_import.data.basic2"
return False
sys.set_lazy_imports_filter(filter)
lazy import test.test_import.data.lazy_imports.basic2 as basic2
lazy import test.test_lazy_import.data.basic2 as basic2
@@ -2,10 +2,10 @@ import sys
def filter(module_name, imported_name, from_list):
assert module_name == __name__
assert imported_name == "test.test_import.data.lazy_imports.basic2"
assert imported_name == "test.test_lazy_import.data.basic2"
assert from_list == ('f',)
return False
sys.set_lazy_imports_filter(filter)
lazy from test.test_import.data.lazy_imports.basic2 import f
lazy from test.test_lazy_import.data.basic2 import f
@@ -2,11 +2,11 @@ import sys
def filter(module_name, imported_name, from_list):
assert module_name == __name__
assert imported_name == "test.test_import.data.lazy_imports.basic2"
assert imported_name == "test.test_lazy_import.data.basic2"
assert from_list == ('f',)
return True
sys.set_lazy_imports("normal")
sys.set_lazy_imports_filter(filter)
lazy from test.test_import.data.lazy_imports.basic2 import f
lazy from test.test_lazy_import.data.basic2 import f
@@ -2,10 +2,10 @@ import sys
def filter(module_name, imported_name, from_list):
assert module_name == __name__
assert imported_name == "test.test_import.data.lazy_imports.basic2"
assert imported_name == "test.test_lazy_import.data.basic2"
return True
sys.set_lazy_imports("normal")
sys.set_lazy_imports_filter(filter)
lazy import test.test_import.data.lazy_imports.basic2 as basic2
lazy import test.test_lazy_import.data.basic2 as basic2
@@ -0,0 +1,5 @@
import sys
sys.set_lazy_imports("none")
lazy import test.test_lazy_import.data.basic2 as basic2
@@ -0,0 +1,5 @@
import sys
sys.set_lazy_imports("all")
import test.test_lazy_import.data.basic2 as basic2
@@ -1,5 +1,5 @@
# Test that globals() returns lazy proxy objects without reifying
lazy import test.test_import.data.lazy_imports.basic2 as basic2
lazy import test.test_lazy_import.data.basic2 as basic2
def get_from_globals():
g = globals()
@@ -0,0 +1,6 @@
# Test __lazy_modules__ with from imports
__lazy_modules__ = ['test.test_lazy_import.data.basic2']
from test.test_lazy_import.data.basic2 import x, f
def get_x():
return x
@@ -1,4 +1,4 @@
lazy import test.test_import.data.lazy_imports.basic2 as basic2
lazy import test.test_lazy_import.data.basic2 as basic2
def f():
x = globals()
@@ -0,0 +1,2 @@
lazy import test.test_lazy_import.data.pkg.bar
x = test.test_lazy_import.data.pkg.bar.f
@@ -0,0 +1,3 @@
import contextlib
with contextlib.nullcontext():
lazy import test.test_lazy_import.data.basic2
@@ -0,0 +1,3 @@
import contextlib
with contextlib.nullcontext():
lazy import test.test_lazy_import.data.basic2 as basic2
@@ -0,0 +1,5 @@
lazy import test.test_lazy_import.data.basic2 as basic2
import sys
mod = sys.modules[__name__]
x = mod.__dict__
@@ -0,0 +1,5 @@
lazy import test.test_lazy_import.data.basic2 as basic2
import sys
mod = sys.modules[__name__]
x = mod.basic2
@@ -0,0 +1,5 @@
lazy import test.test_lazy_import.data.basic2 as basic2
import sys
mod = sys.modules[__name__]
x = mod.__name__
@@ -1,5 +1,5 @@
# Test that lazy from import with multiple names only reifies accessed names
lazy from test.test_import.data.lazy_imports.basic2 import f, x
lazy from test.test_lazy_import.data.basic2 import f, x
def get_globals():
return globals()
@@ -0,0 +1,4 @@
try:
import test.test_lazy_import.data.basic2
except:
pass
@@ -0,0 +1,4 @@
try:
from test.test_lazy_import.data.basic2 import f
except:
pass
+6 -6
View File
@@ -5383,8 +5383,8 @@ class TestLazyImportSuggestions(unittest.TestCase):
# pkg.bar prints "BAR_MODULE_LOADED" when imported.
# If lazy import is reified during suggestion computation, we'll see it.
code = textwrap.dedent("""
lazy import test.test_import.data.lazy_imports.pkg.bar
test.test_import.data.lazy_imports.pkg.nonexistent
lazy import test.test_lazy_import.data.pkg.bar
test.test_lazy_import.data.pkg.nonexistent
""")
rc, stdout, stderr = assert_python_failure('-c', code)
self.assertNotIn(b"BAR_MODULE_LOADED", stdout)
@@ -5393,9 +5393,9 @@ class TestLazyImportSuggestions(unittest.TestCase):
"""Formatting a traceback should not trigger lazy import reification."""
code = textwrap.dedent("""
import traceback
lazy import test.test_import.data.lazy_imports.pkg.bar
lazy import test.test_lazy_import.data.pkg.bar
try:
test.test_import.data.lazy_imports.pkg.nonexistent
test.test_lazy_import.data.pkg.nonexistent
except AttributeError:
traceback.format_exc()
print("OK")
@@ -5407,9 +5407,9 @@ class TestLazyImportSuggestions(unittest.TestCase):
def test_suggestion_still_works_for_non_lazy_attributes(self):
"""Suggestions should still work for non-lazy module attributes."""
code = textwrap.dedent("""
lazy import test.test_import.data.lazy_imports.pkg.bar
lazy import test.test_lazy_import.data.pkg.bar
# Typo for __name__
test.test_import.data.lazy_imports.pkg.__nme__
test.test_lazy_import.data.pkg.__nme__
""")
rc, stdout, stderr = assert_python_failure('-c', code)
self.assertIn(b"__name__", stderr)
+4 -3
View File
@@ -2682,9 +2682,6 @@ TESTSUBDIRS= idlelib/idle_test \
test/test_import/data/package3 \
test/test_import/data/package4 \
test/test_import/data/unwritable \
test/test_import/data/lazy_imports \
test/test_import/data/lazy_imports/pkg \
test/test_import/data/lazy_imports/badsyntax \
test/test_importlib \
test/test_importlib/builtin \
test/test_importlib/extension \
@@ -2725,6 +2722,10 @@ TESTSUBDIRS= idlelib/idle_test \
test/test_interpreters \
test/test_io \
test/test_json \
test/test_lazy_import \
test/test_lazy_import/data \
test/test_lazy_import/data/pkg \
test/test_lazy_import/data/badsyntax \
test/test_module \
test/test_multiprocessing_fork \
test/test_multiprocessing_forkserver \