get_calling_module_name() now works through import

Author: sveinugu

src/omnipy/util/helpers.py

@@ -242,8 +242,10 @@ def recursive_module_import(module: ModuleType, imported_modules: list[ModuleTyp
 
 def get_calling_module_name() -> str | None:
     stack = inspect.stack()
-    if len(stack) >= 3:
-        grandparent_frame = inspect.stack()[2][0]
+    start_frame_index = 2
+    while len(stack) > start_frame_index:
+        grandparent_frame = stack[start_frame_index][0]
         module = inspect.getmodule(grandparent_frame)
         if module is not None:
             return module.__name__
+        start_frame_index += 1

tests/util/helpers/__init__.py

@@ -1,6 +0,0 @@
-from omnipy.util.helpers import get_calling_module_name
-
-
-# For test_helpers::test_get_calling_module_name
-def other_module_call_get_calling_module_name() -> str:
-    return get_calling_module_name()

tests/util/helpers/other_module.py

@@ -0,0 +1,9 @@
+from omnipy.util.helpers import get_calling_module_name
+
+
+# For test_helpers::test_get_calling_module_name
+def other_module_call_get_calling_module_name() -> str:
+    return get_calling_module_name()
+
+
+calling_module_name_when_importing_other_module = get_calling_module_name()

tests/util/test_helpers.py

@@ -23,8 +23,6 @@
                                  RestorableContents,
                                  transfer_generic_args_to_cls)
 
-from .helpers import other_module_call_get_calling_module_name
-
 T = TypeVar('T')
 U = TypeVar('U')
 
@@ -409,5 +407,10 @@ def test_get_calling_module_name() -> None:
     def local_call_get_calling_module_name() -> str:
         return get_calling_module_name()
 
+    from .helpers.other_module import (calling_module_name_when_importing_other_module,
+                                       other_module_call_get_calling_module_name)
+
     assert local_call_get_calling_module_name() == 'tests.util.test_helpers'
     assert other_module_call_get_calling_module_name() == 'tests.util.test_helpers'
+    assert calling_module_name_when_importing_other_module == 'tests.util.test_helpers'
+