From d58a8b48c1bb5c638dc2a8ec4a6dca1db05c69ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franz=20Kir=C3=A1ly?= Date: Fri, 19 May 2023 13:07:32 +0100 Subject: [PATCH 1/6] Update _lookup.py --- skbase/lookup/_lookup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/skbase/lookup/_lookup.py b/skbase/lookup/_lookup.py index dc4bdf3f..cd99073a 100644 --- a/skbase/lookup/_lookup.py +++ b/skbase/lookup/_lookup.py @@ -291,10 +291,10 @@ def _import_module( elif isinstance(module, importlib.machinery.SourceFileLoader): if suppress_import_stdout: sys.stdout = io.StringIO() - imported_mod = module.load_module() + imported_mod = module.exec_module() sys.stdout = sys.__stdout__ else: - imported_mod = module.load_module() + imported_mod = module.exec_module() else: raise ValueError( "`module` should be string module name or instance of " From 10170a00fed9b1a78cc7c337ac77323232b92719 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franz=20Kir=C3=A1ly?= Date: Tue, 3 Oct 2023 17:25:26 +0200 Subject: [PATCH 2/6] maybe like this --- skbase/lookup/_lookup.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/skbase/lookup/_lookup.py b/skbase/lookup/_lookup.py index fc4163ed..19e86ae7 100644 --- a/skbase/lookup/_lookup.py +++ b/skbase/lookup/_lookup.py @@ -297,7 +297,12 @@ def _import_module( if isinstance(module, str): imported_mod = importlib.import_module(module) elif isinstance(module, importlib.machinery.SourceFileLoader): - imported_mod = module.load_module() + spec = importlib.machinery.ModuleSpec( + name=module.name, + loader=module, + origin=module.path, + ) + imported_mod = importlib.util.module_from_spec(spec) exc = None except Exception as e: # we store the exception so we can restore the stdout fisrt From edc2014b9c7784db988bd4e7df1629539f814aa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franz=20Kir=C3=A1ly?= Date: Tue, 3 Oct 2023 18:06:18 +0200 Subject: [PATCH 3/6] Update _lookup.py --- skbase/lookup/_lookup.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/skbase/lookup/_lookup.py b/skbase/lookup/_lookup.py index 19e86ae7..f05109e1 100644 --- a/skbase/lookup/_lookup.py +++ b/skbase/lookup/_lookup.py @@ -297,11 +297,7 @@ def _import_module( if isinstance(module, str): imported_mod = importlib.import_module(module) elif isinstance(module, importlib.machinery.SourceFileLoader): - spec = importlib.machinery.ModuleSpec( - name=module.name, - loader=module, - origin=module.path, - ) + spec = importlib.util.spec_from_loader(module.name, module) imported_mod = importlib.util.module_from_spec(spec) exc = None except Exception as e: From cdf3d93471b7102ee658ac733e96c0e6fa054632 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franz=20Kir=C3=A1ly?= Date: Tue, 3 Oct 2023 18:08:51 +0200 Subject: [PATCH 4/6] Update _lookup.py --- skbase/lookup/_lookup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/skbase/lookup/_lookup.py b/skbase/lookup/_lookup.py index f05109e1..026825e3 100644 --- a/skbase/lookup/_lookup.py +++ b/skbase/lookup/_lookup.py @@ -298,6 +298,7 @@ def _import_module( imported_mod = importlib.import_module(module) elif isinstance(module, importlib.machinery.SourceFileLoader): spec = importlib.util.spec_from_loader(module.name, module) + spec.origin = module.path imported_mod = importlib.util.module_from_spec(spec) exc = None except Exception as e: From 43a6abb8242405ac4324e58eb9537f11fced18c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franz=20Kir=C3=A1ly?= Date: Wed, 4 Oct 2023 23:31:50 +0200 Subject: [PATCH 5/6] try this --- skbase/lookup/_lookup.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/skbase/lookup/_lookup.py b/skbase/lookup/_lookup.py index 026825e3..7a9b521e 100644 --- a/skbase/lookup/_lookup.py +++ b/skbase/lookup/_lookup.py @@ -297,9 +297,11 @@ def _import_module( if isinstance(module, str): imported_mod = importlib.import_module(module) elif isinstance(module, importlib.machinery.SourceFileLoader): - spec = importlib.util.spec_from_loader(module.name, module) - spec.origin = module.path + spec = importlib.spec_from_file_location(module.name, module.path) imported_mod = importlib.util.module_from_spec(spec) + + loader = spec.loader + loader.exec_module(imported_mod) exc = None except Exception as e: # we store the exception so we can restore the stdout fisrt From a2aa811551c2ac585156933395e5242df0de53ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franz=20Kir=C3=A1ly?= Date: Wed, 4 Oct 2023 23:33:42 +0200 Subject: [PATCH 6/6] Update _lookup.py --- skbase/lookup/_lookup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skbase/lookup/_lookup.py b/skbase/lookup/_lookup.py index 7a9b521e..b45b7c5c 100644 --- a/skbase/lookup/_lookup.py +++ b/skbase/lookup/_lookup.py @@ -297,7 +297,7 @@ def _import_module( if isinstance(module, str): imported_mod = importlib.import_module(module) elif isinstance(module, importlib.machinery.SourceFileLoader): - spec = importlib.spec_from_file_location(module.name, module.path) + spec = importlib.util.spec_from_file_location(module.name, module.path) imported_mod = importlib.util.module_from_spec(spec) loader = spec.loader