fix module registry name preprocessing

BrianPugh · Nov 27, 2023 · ff5b3ff · ff5b3ff
1 parent 71db7bb
commit ff5b3ff
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 3 deletions.
diff --git a/autoregistry/_registry.py b/autoregistry/_registry.py
@@ -407,9 +407,11 @@ def __call__(
 
                 subregistry = RegistryDecorator(**config.asdict())
                 subregistry(handle)
-                self(subregistry, name=elem_name)
+                name = subregistry.__registry__.config.format(elem_name)
+                self(subregistry, name=name)
             else:
-                self(handle, name=elem_name)
+                name = self.__registry__.config.format(elem_name)
+                self(handle, name=name)
 
         return obj
 

diff --git a/tests/fake_module/__init__.py b/tests/fake_module/__init__.py
@@ -1,2 +1,3 @@
 from . import fake_module_1, fake_submodule_1
 from .fake_module_2 import __magic2__, _foo_private2, bar2, foo2
+from .fake_module_3 import FakeModule3
diff --git a/tests/fake_module/fake_module_3.py b/tests/fake_module/fake_module_3.py
@@ -0,0 +1,2 @@
+class FakeModule3:
+    pass
diff --git a/tests/test_functions.py b/tests/test_functions.py
@@ -49,6 +49,7 @@ def assert_fake_module_registry(registry, fake_module):
     assert registry["fake_module_1"]["some_list"] == fake_module.fake_module_1.some_list
     assert registry["fake_module_2"]["foo2"] == fake_module.fake_module_2.foo2
     assert registry["fake_module_2"]["bar2"] == fake_module.fake_module_2.bar2
+    assert registry["fakemodule3"] == fake_module.FakeModule3
     assert registry["foo2"] == fake_module.foo2
 
 
@@ -58,9 +59,11 @@ def test_defaults_module():
     registry = Registry()
     registry(fake_module)
     assert list(registry) == [
+        "fakemodule3",
         "bar2",
         "fake_module_1",
         "fake_module_2",
+        "fake_module_3",
         "fake_submodule_1",
         "foo2",
     ]

diff --git a/tests/test_functions_config.py b/tests/test_functions_config.py
@@ -217,4 +217,4 @@ def test_module_non_recursive():
 
     registry = Registry(recursive=False)
     registry(fake_module)
-    assert list(registry) == ["bar2", "foo2"]
+    assert list(registry) == ["fakemodule3", "bar2", "foo2"]