Fix "lazy from (...) import (...)" tests (#145213)

diff --git a/Lib/test/test_import/data/lazy_imports/global_filter_from.py b/Lib/test/test_import/data/lazy_imports/global_filter_from.py
index 733839d9c1e9353e88b92ba970a7a2c37a78c8a4..93a1280292f8af8f9aa5dbb52aff4f8c0a05a78d 100644 (file)
--- a/Lib/test/test_import/data/lazy_imports/global_filter_from.py
+++ b/Lib/test/test_import/data/lazy_imports/global_filter_from.py
@@ -1,11 +1,11 @@
-import importlib
+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 from_list == ['f']
+    assert from_list == ('f',)
     return False
 
-importlib.set_lazy_imports(None, filter)
+sys.set_lazy_imports_filter(filter)
 
-lazy from import test.test_import.data.lazy_imports.basic2 import f
+lazy from test.test_import.data.lazy_imports.basic2 import f

diff --git a/Lib/test/test_import/data/lazy_imports/global_filter_from_true.py b/Lib/test/test_import/data/lazy_imports/global_filter_from_true.py
index c019f1ae8117a4bd78a0dfa5648e102ea0327985..bc51215ae26ce43b788fbf2d52ce82dc5e4a43ef 100644 (file)
--- a/Lib/test/test_import/data/lazy_imports/global_filter_from_true.py
+++ b/Lib/test/test_import/data/lazy_imports/global_filter_from_true.py
@@ -1,11 +1,12 @@
-import importlib
+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 from_list == ['f']
+    assert from_list == ('f',)
     return True
 
-importlib.set_lazy_imports(None, filter)
+sys.set_lazy_imports("normal")
+sys.set_lazy_imports_filter(filter)
 
-lazy from import test.test_import.data.lazy_imports.basic2 import f
+lazy from test.test_import.data.lazy_imports.basic2 import f

diff --git a/Lib/test/test_import/test_lazy_imports.py b/Lib/test/test_import/test_lazy_imports.py
index 39d37f68e0b47baf9460db1940fbc2b459df94bb..a40e4892a78bb25c177913bec741aef4d70fb559 100644 (file)
--- a/Lib/test/test_import/test_lazy_imports.py
+++ b/Lib/test/test_import/test_lazy_imports.py
@@ -119,12 +119,12 @@ class GlobalLazyImportModeTests(unittest.TestCase):
 
     def test_global_filter_from(self):
         """Filter should work with 'from' imports."""
-        import test.test_import.data.lazy_imports.global_filter
+        import test.test_import.data.lazy_imports.global_filter_from
         self.assertIn("test.test_import.data.lazy_imports.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_true
+        import test.test_import.data.lazy_imports.global_filter_from_true
         self.assertNotIn("test.test_import.data.lazy_imports.basic2", sys.modules)