refactor: Auto-register module in collection within loading helpers

Issue #177: #177

Author: pawamoy

src/griffe/tests.py

@@ -174,7 +174,7 @@ def temporary_visited_module(
     """
     patch_ast()
     with temporary_pyfile(code, module_name=module_name) as (_, path):
-        yield visit(
+        module = visit(
             module_name,
             filepath=path,
             code=dedent(code),
@@ -185,6 +185,8 @@ def temporary_visited_module(
             lines_collection=lines_collection,
             modules_collection=modules_collection,
         )
+        module.modules_collection[module_name] = module
+        yield module
 
 
 @contextmanager
@@ -218,7 +220,7 @@ def temporary_inspected_module(
     """
     with temporary_pyfile(code, module_name=module_name) as (_, path):
         try:
-            yield inspect(
+            module = inspect(
                 module_name,
                 filepath=path,
                 import_paths=import_paths,
@@ -229,6 +231,8 @@ def temporary_inspected_module(
                 lines_collection=lines_collection,
                 modules_collection=modules_collection,
             )
+            module.modules_collection[module_name] = module
+            yield module
         finally:
             if module_name in sys.modules:
                 del sys.modules[module_name]

tests/test_inheritance.py

@@ -56,9 +56,6 @@ def method_from_d(self): ...
             inspection_options["import_paths"] = [module1.filepath.parent]
 
         with agent2(code2, module_name="module2", modules_collection=collection, **inspection_options) as module2:
-            collection["module1"] = module1
-            collection["module2"] = module2
-
             classa = module1["A"]
             classb = module1["B"]
             classc = module2["C"]
@@ -102,9 +99,7 @@ class B:
         class C(A.B):
             attr_from_c = 1
     """
-    collection = ModulesCollection()
-    with agent(code, modules_collection=collection) as module:
-        collection["module"] = module
+    with agent(code) as module:
         assert "attr_from_b" in module["C"].inherited_members
 
     code = """
@@ -117,9 +112,7 @@ class Inner(OuterA.Inner): ...
         class OuterD(OuterC):
             class Inner(OuterC.Inner, OuterB.Inner): ...
     """
-    collection = ModulesCollection()
-    with temporary_visited_module(code, modules_collection=collection) as module:
-        collection["module"] = module
+    with temporary_visited_module(code) as module:
         assert _mro_paths(module["OuterD.Inner"]) == [
             "module.OuterC.Inner",
             "module.OuterB.Inner",
@@ -149,9 +142,7 @@ def test_computing_mro(classes: list[str], cls: str, expected_mro: list[str]) ->
         expected_mro: The expected computed MRO.
     """
     code = "class " + ": ...\nclass ".join(classes) + ": ..."
-    collection = ModulesCollection()
-    with temporary_visited_module(code, modules_collection=collection) as module:
-        collection["module"] = module
+    with temporary_visited_module(code) as module:
         assert _mro_paths(module[cls]) == [f"module.{base}" for base in expected_mro]
 
 
@@ -170,11 +161,8 @@ def test_uncomputable_mro(classes: list[str], cls: str) -> None:
         cls: The class to compute the MRO of.
     """
     code = "class " + ": ...\nclass ".join(classes) + ": ..."
-    collection = ModulesCollection()
-    with temporary_visited_module(code, modules_collection=collection) as module:
-        collection["module"] = module
-        with pytest.raises(ValueError, match="Cannot compute C3 linearization"):
-            _mro_paths(module[cls])
+    with temporary_visited_module(code) as module, pytest.raises(ValueError, match="Cannot compute C3 linearization"):
+        _mro_paths(module[cls])
 
 
 def test_dynamic_base_classes() -> None:
@@ -184,12 +172,8 @@ def test_dynamic_base_classes() -> None:
         class A(namedtuple("B", "attrb")):
             attra = 0
     """
-    collection = ModulesCollection()
-    with temporary_visited_module(code, modules_collection=collection) as module:
-        collection["module"] = module
+    with temporary_visited_module(code) as module:
         assert _mro_paths(module["A"]) == []  # not supported
 
-    collection = ModulesCollection()
-    with temporary_inspected_module(code, modules_collection=collection) as module:
-        collection["module"] = module
+    with temporary_inspected_module(code) as module:
         assert _mro_paths(module["A"]) == []  # not supported either