scientific-python
diff --git a/‎src/lazy_loader/__init__.py
Copy file name to clipboardExpand all lines: src/lazy_loader/__init__.py
+7-10Lines changed: 7 additions & 10 deletions b/‎src/lazy_loader/__init__.py
Copy file name to clipboardExpand all lines: src/lazy_loader/__init__.py
+7-10Lines changed: 7 additions & 10 deletions
diff --git a/‎tests/test_lazy_loader.py
Copy file name to clipboardExpand all lines: tests/test_lazy_loader.py
+35-9Lines changed: 35 additions & 9 deletions b/‎tests/test_lazy_loader.py
Copy file name to clipboardExpand all lines: tests/test_lazy_loader.py
+35-9Lines changed: 35 additions & 9 deletions
@@ -106,16 +106,13 @@ def __init__(self, frame_data, *args, message, **kwargs):
         super().__init__(*args, **kwargs)
 
     def __getattr__(self, x):
-        if x in ("__class__", "__file__", "__frame_data", "__message"):
-            super().__getattr__(x)
-        else:
-            fd = self.__frame_data
-            raise ModuleNotFoundError(
-                f"{self.__message}\n\n"
-                "This error is lazily reported, having originally occurred in\n"
-                f"  File {fd['filename']}, line {fd['lineno']}, in {fd['function']}\n\n"
-                f"----> {''.join(fd['code_context'] or '').strip()}"
-            )
+        fd = self.__frame_data
+        raise ModuleNotFoundError(
+            f"{self.__message}\n\n"
+            "This error is lazily reported, having originally occurred in\n"
+            f"  File {fd['filename']}, line {fd['lineno']}, in {fd['function']}\n\n"
+            f"----> {''.join(fd['code_context'] or '').strip()}"
+        )
 
 
 def load(fullname, *, require=None, error_on_import=False, suppress_warning=False):
 
@@ -10,6 +10,26 @@
 import lazy_loader as lazy
 
 
+@pytest.fixture
+def clean_fake_pkg():
+    yield
+    sys.modules.pop("tests.fake_pkg.some_func", None)
+    sys.modules.pop("tests.fake_pkg", None)
+    sys.modules.pop("tests", None)
+
+
+@pytest.mark.parametrize("attempt", [1, 2])
+def test_cleanup_fixture(clean_fake_pkg, attempt):
+    assert "tests.fake_pkg" not in sys.modules
+    assert "tests.fake_pkg.some_func" not in sys.modules
+    from tests import fake_pkg
+
+    assert "tests.fake_pkg" in sys.modules
+    assert "tests.fake_pkg.some_func" not in sys.modules
+    assert isinstance(fake_pkg.some_func, types.FunctionType)
+    assert "tests.fake_pkg.some_func" in sys.modules
+
+
 def test_lazy_import_basics():
     math = lazy.load("math")
     anything_not_real = lazy.load("anything_not_real")
@@ -127,18 +147,24 @@ def test_lazy_attach_returns_copies():
     assert _all == [*expected, "modify_returned_all"]
 
 
-def test_attach_same_module_and_attr_name():
-    from tests import fake_pkg
+@pytest.mark.parametrize("eager_import", [False, True])
+def test_attach_same_module_and_attr_name(clean_fake_pkg, eager_import):
+    env = {}
+    if eager_import:
+        env["EAGER_IMPORT"] = "1"
 
-    # Grab attribute twice, to ensure that importing it does not
-    # override function by module
-    assert isinstance(fake_pkg.some_func, types.FunctionType)
-    assert isinstance(fake_pkg.some_func, types.FunctionType)
+    with mock.patch.dict(os.environ, env):
+        from tests import fake_pkg
+
+        # Grab attribute twice, to ensure that importing it does not
+        # override function by module
+        assert isinstance(fake_pkg.some_func, types.FunctionType)
+        assert isinstance(fake_pkg.some_func, types.FunctionType)
 
-    # Ensure imports from submodule still work
-    from tests.fake_pkg.some_func import some_func
+        # Ensure imports from submodule still work
+        from tests.fake_pkg.some_func import some_func
 
-    assert isinstance(some_func, types.FunctionType)
+        assert isinstance(some_func, types.FunctionType)
 
 
 FAKE_STUB = """