From ed4f2c6aad169235d29b688651955cb7f9106334 Mon Sep 17 00:00:00 2001 From: BitterPanda Date: Thu, 12 Jun 2025 00:28:10 +0200 Subject: [PATCH 1/3] Remove submodules, still check their version --- aikido_zen/sinks/builtins_import.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/aikido_zen/sinks/builtins_import.py b/aikido_zen/sinks/builtins_import.py index a39486bc..3873ce87 100644 --- a/aikido_zen/sinks/builtins_import.py +++ b/aikido_zen/sinks/builtins_import.py @@ -14,9 +14,10 @@ def _import(func, instance, args, kwargs, return_value): return name = getattr(return_value, "__package__") - if not name or "." in name: - # Make sure the name exists and that it's not a submodule + if not name: + # Make sure the name exists return + name = name.split(".")[0] # Remove submodules if name == "importlib_metadata": # Avoid circular dependencies return From 581d10e9f7aefb657e84fd9386cadeb1172156cf Mon Sep 17 00:00:00 2001 From: BitterPanda Date: Thu, 12 Jun 2025 00:31:18 +0200 Subject: [PATCH 2/3] lint --- aikido_zen/sinks/builtins_import.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aikido_zen/sinks/builtins_import.py b/aikido_zen/sinks/builtins_import.py index 3873ce87..46fc0899 100644 --- a/aikido_zen/sinks/builtins_import.py +++ b/aikido_zen/sinks/builtins_import.py @@ -17,7 +17,7 @@ def _import(func, instance, args, kwargs, return_value): if not name: # Make sure the name exists return - name = name.split(".")[0] # Remove submodules + name = name.split(".")[0] # Remove submodules if name == "importlib_metadata": # Avoid circular dependencies return From 9abd45569b459bc3ca20f4c084824056551b2904 Mon Sep 17 00:00:00 2001 From: BitterPanda63 Date: Thu, 12 Jun 2025 11:55:20 +0200 Subject: [PATCH 3/3] Make sure to also ignore "importlib" --- aikido_zen/sinks/builtins_import.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aikido_zen/sinks/builtins_import.py b/aikido_zen/sinks/builtins_import.py index 46fc0899..ba646f29 100644 --- a/aikido_zen/sinks/builtins_import.py +++ b/aikido_zen/sinks/builtins_import.py @@ -18,7 +18,7 @@ def _import(func, instance, args, kwargs, return_value): # Make sure the name exists return name = name.split(".")[0] # Remove submodules - if name == "importlib_metadata": + if name == "importlib" or name == "importlib_metadata": # Avoid circular dependencies return