Fix lazy imports to reflect new layout

johnslavik · johnslavik · commit 4e382a6c909b · 2026-02-28T00:57:28.000+01:00
diff --git a/Lib/test/test_lazy_import/data/basic_compatibility_mode.py b/Lib/test/test_lazy_import/data/basic_compatibility_mode.py
@@ -1,2 +1,2 @@
-__lazy_modules__ = ['test.test_import.data.lazy_imports.basic2']
-import test.test_import.data.lazy_imports.basic2
+__lazy_modules__ = ['test.test_lazy_import.data.basic2']
+import test.test_lazy_import.data.basic2
diff --git a/Lib/test/test_lazy_import/data/basic_compatibility_mode_relative.py b/Lib/test/test_lazy_import/data/basic_compatibility_mode_relative.py
@@ -1,2 +1,2 @@
-__lazy_modules__ = ['test.test_import.data.lazy_imports.basic2']
+__lazy_modules__ = ['test.test_lazy_import.data.basic2']
 lazy from .basic2 import f
diff --git a/Lib/test/test_lazy_import/data/basic_compatibility_mode_used.py b/Lib/test/test_lazy_import/data/basic_compatibility_mode_used.py
@@ -1,3 +1,3 @@
-__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()
+__lazy_modules__ = ['test.test_lazy_import.data.basic2']
+import test.test_lazy_import.data.basic2
+test.test_lazy_import.data.basic2.f()
diff --git a/Lib/test/test_lazy_import/data/basic_dir.py b/Lib/test/test_lazy_import/data/basic_dir.py
@@ -1,2 +1,2 @@
-lazy import test.test_import.data.lazy_imports.basic2
+lazy import test.test_lazy_import.data.basic2
 x = dir()
diff --git a/Lib/test/test_lazy_import/data/basic_unused.py b/Lib/test/test_lazy_import/data/basic_unused.py
@@ -1 +1 @@
-lazy import test.test_import.data.lazy_imports.basic2
+lazy import test.test_lazy_import.data.basic2
diff --git a/Lib/test/test_lazy_import/data/basic_used.py b/Lib/test/test_lazy_import/data/basic_used.py
@@ -1,3 +1,3 @@
-lazy import test.test_import.data.lazy_imports.basic2 as basic2
+lazy import test.test_lazy_import.data.basic2 as basic2
 
 basic2.f()
diff --git a/Lib/test/test_lazy_import/data/compatibility_mode_func.py b/Lib/test/test_lazy_import/data/compatibility_mode_func.py
@@ -1,5 +1,5 @@
-__lazy_modules__ = ['test.test_import.data.lazy_imports.basic2']
+__lazy_modules__ = ['test.test_lazy_import.data.basic2']
 def f():
-    import test.test_import.data.lazy_imports.basic2
+    import test.test_lazy_import.data.basic2
 
 f()
diff --git a/Lib/test/test_lazy_import/data/compatibility_mode_try_except.py b/Lib/test/test_lazy_import/data/compatibility_mode_try_except.py
@@ -1,5 +1,5 @@
-__lazy_modules__ = ['test.test_import.data.lazy_imports.basic2']
+__lazy_modules__ = ['test.test_lazy_import.data.basic2']
 try:
-    import test.test_import.data.lazy_imports.basic2
+    import test.test_lazy_import.data.basic2
 except:
     pass
diff --git a/Lib/test/test_lazy_import/data/dunder_lazy_import.py b/Lib/test/test_lazy_import/data/dunder_lazy_import.py
@@ -1 +1 @@
-basic = __lazy_import__('test.test_import.data.lazy_imports.basic2')
+basic = __lazy_import__('test.test_lazy_import.data.basic2')
diff --git a/Lib/test/test_lazy_import/data/dunder_lazy_import_builtins.py b/Lib/test/test_lazy_import/data/dunder_lazy_import_builtins.py
@@ -9,6 +9,6 @@ def myimport(*args):
     "__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
diff --git a/Lib/test/test_lazy_import/data/eager_import_func.py b/Lib/test/test_lazy_import/data/eager_import_func.py
@@ -1,3 +1,3 @@
 def f():
-    import test.test_import.data.lazy_imports.basic2 as basic2
+    import test.test_lazy_import.data.basic2 as basic2
     return basic2
diff --git a/Lib/test/test_lazy_import/data/global_filter.py b/Lib/test/test_lazy_import/data/global_filter.py
@@ -2,9 +2,9 @@
 
 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
diff --git a/Lib/test/test_lazy_import/data/global_filter_from.py b/Lib/test/test_lazy_import/data/global_filter_from.py
@@ -2,10 +2,10 @@
 
 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
diff --git a/Lib/test/test_lazy_import/data/global_filter_from_true.py b/Lib/test/test_lazy_import/data/global_filter_from_true.py
@@ -2,11 +2,11 @@
 
 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
diff --git a/Lib/test/test_lazy_import/data/global_filter_true.py b/Lib/test/test_lazy_import/data/global_filter_true.py
@@ -2,10 +2,10 @@
 
 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
diff --git a/Lib/test/test_lazy_import/data/global_off.py b/Lib/test/test_lazy_import/data/global_off.py
@@ -2,4 +2,4 @@
 
 sys.set_lazy_imports("none")
 
-lazy import test.test_import.data.lazy_imports.basic2 as basic2
+lazy import test.test_lazy_import.data.basic2 as basic2
diff --git a/Lib/test/test_lazy_import/data/global_on.py b/Lib/test/test_lazy_import/data/global_on.py
@@ -2,4 +2,4 @@
 
 sys.set_lazy_imports("all")
 
-import test.test_import.data.lazy_imports.basic2 as basic2
+import test.test_lazy_import.data.basic2 as basic2
diff --git a/Lib/test/test_lazy_import/data/globals_access.py b/Lib/test/test_lazy_import/data/globals_access.py
@@ -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()
diff --git a/Lib/test/test_lazy_import/data/lazy_compat_from.py b/Lib/test/test_lazy_import/data/lazy_compat_from.py
@@ -1,6 +1,6 @@
 # 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
+__lazy_modules__ = ['test.test_lazy_import.data.basic2']
+from test.test_lazy_import.data.basic2 import x, f
 
 def get_x():
     return x
diff --git a/Lib/test/test_lazy_import/data/lazy_get_value.py b/Lib/test/test_lazy_import/data/lazy_get_value.py
@@ -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()
diff --git a/Lib/test/test_lazy_import/data/lazy_import_pkg.py b/Lib/test/test_lazy_import/data/lazy_import_pkg.py
@@ -1,2 +1,2 @@
-lazy import test.test_import.data.lazy_imports.pkg.bar
-x = test.test_import.data.lazy_imports.pkg.bar.f
+lazy import test.test_lazy_import.data.pkg.bar
+x = test.test_lazy_import.data.pkg.bar.f
diff --git a/Lib/test/test_lazy_import/data/lazy_with.py b/Lib/test/test_lazy_import/data/lazy_with.py
@@ -1,3 +1,3 @@
 import contextlib
 with contextlib.nullcontext():
-    lazy import test.test_import.data.lazy_imports.basic2
+    lazy import test.test_lazy_import.data.basic2
diff --git a/Lib/test/test_lazy_import/data/lazy_with_from.py b/Lib/test/test_lazy_import/data/lazy_with_from.py
@@ -1,3 +1,3 @@
 import contextlib
 with contextlib.nullcontext():
-    lazy import test.test_import.data.lazy_imports.basic2 as basic2
+    lazy import test.test_lazy_import.data.basic2 as basic2
diff --git a/Lib/test/test_lazy_import/data/modules_dict.py b/Lib/test/test_lazy_import/data/modules_dict.py
@@ -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
 
 import sys
 mod = sys.modules[__name__]
diff --git a/Lib/test/test_lazy_import/data/modules_getattr.py b/Lib/test/test_lazy_import/data/modules_getattr.py
@@ -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
 
 import sys
 mod = sys.modules[__name__]
diff --git a/Lib/test/test_lazy_import/data/modules_getattr_other.py b/Lib/test/test_lazy_import/data/modules_getattr_other.py
@@ -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
 
 import sys
 mod = sys.modules[__name__]
diff --git a/Lib/test/test_lazy_import/data/multi_from_import.py b/Lib/test/test_lazy_import/data/multi_from_import.py
@@ -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()
diff --git a/Lib/test/test_lazy_import/data/try_except_eager.py b/Lib/test/test_lazy_import/data/try_except_eager.py
@@ -1,4 +1,4 @@
 try:
-    import test.test_import.data.lazy_imports.basic2
+    import test.test_lazy_import.data.basic2
 except:
     pass
diff --git a/Lib/test/test_lazy_import/data/try_except_eager_from.py b/Lib/test/test_lazy_import/data/try_except_eager_from.py
@@ -1,4 +1,4 @@
 try:
-    from test.test_import.data.lazy_imports.basic2 import f
+    from test.test_lazy_import.data.basic2 import f
 except:
     pass
diff --git a/Lib/test/test_traceback.py b/Lib/test/test_traceback.py
@@ -5383,8 +5383,8 @@ def test_attribute_error_does_not_reify_lazy_imports(self):
         # 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 @@ def test_traceback_formatting_does_not_reify_lazy_imports(self):
         """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 @@ def test_traceback_formatting_does_not_reify_lazy_imports(self):
     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)

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-__lazy_modules__ = ['test.test_import.data.lazy_imports.basic2']`
	`1`	`+__lazy_modules__ = ['test.test_lazy_import.data.basic2']`
`2`	`2`	`lazy from .basic2 import f`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-lazy import test.test_import.data.lazy_imports.basic2`
	`1`	`+lazy import test.test_lazy_import.data.basic2`
`2`	`2`	`x = dir()`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-lazy import test.test_import.data.lazy_imports.basic2`
	`1`	`+lazy import test.test_lazy_import.data.basic2`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-lazy import test.test_import.data.lazy_imports.basic2 as basic2`
	`1`	`+lazy import test.test_lazy_import.data.basic2 as basic2`
`2`	`2`
`3`	`3`	`basic2.f()`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-basic = __lazy_import__('test.test_import.data.lazy_imports.basic2')`
	`1`	`+basic = __lazy_import__('test.test_lazy_import.data.basic2')`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,6 @@ def myimport(*args):`
`9`	`9`	`"__import__": myimport,`
`10`	`10`	`}`
`11`	`11`	`basic2 = 42`
`12`		`-basic = __lazy_import__("test.test_import.data.lazy_imports.basic2",`
	`12`	`+basic = __lazy_import__("test.test_lazy_import.data.basic2",`
`13`	`13`	`globals=new_globals)`
`14`	`14`	`basic`