From cd4787004beb0b84f51ce91df21c518d36f7309b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filipe=20La=C3=ADns?= Date: Wed, 25 Feb 2026 12:45:43 +0000 Subject: [PATCH] Fix "lazy from (...) import (...)" tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Filipe Laíns --- .../test_import/data/lazy_imports/global_filter_from.py | 8 ++++---- .../data/lazy_imports/global_filter_from_true.py | 9 +++++---- Lib/test/test_import/test_lazy_imports.py | 4 ++-- 3 files changed, 11 insertions(+), 10 deletions(-) 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 733839d9c1e935..93a1280292f8af 100644 --- 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 c019f1ae8117a4..bc51215ae26ce4 100644 --- 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 39d37f68e0b47b..a40e4892a78bb2 100644 --- a/Lib/test/test_import/test_lazy_imports.py +++ b/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)