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

Author: FFY00

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

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

Lib/test/test_import/test_lazy_imports.py

@@ -119,12 +119,12 @@ def test_global_filter_true(self):
 
     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)