Skip to content

Commit 8ae1d5c

Browse files
committed
draft: Fix FileFinder error
1 parent 7f772d6 commit 8ae1d5c

2 files changed

Lines changed: 9 additions & 2 deletions

File tree

leapp/repository/__init__.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
import os
33
import pkgutil
44
import sys
5+
import importlib.util
56

67
from leapp.exceptions import RepoItemPathDoesNotExistError, UnsupportedDefinitionKindError
78
from leapp.models import get_models, resolve_model_references
@@ -166,7 +167,10 @@ def _load_modules(self, modules, prefix):
166167
directories = [os.path.join(self._repo_dir, os.path.dirname(module)) for module in modules]
167168
prefix = prefix + '.' if not prefix.endswith('.') else prefix
168169
for importer, name, ispkg in pkgutil.iter_modules(directories, prefix=prefix):
169-
importer.find_module(name).load_module(name)
170+
spec = importer.find_spec(name)
171+
module = importlib.util.module_from_spec(spec)
172+
sys.modules[name] = module
173+
spec.loader.exec_module(module)
170174

171175
def serialize(self):
172176
"""

leapp/repository/actor_definition.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,10 @@ def load(self):
193193
path = os.path.abspath(os.path.join(self._repo_dir, self.directory))
194194
for importer, name, is_pkg in pkgutil.iter_modules((path,)):
195195
if not is_pkg:
196-
self._module = importer.find_module(name).load_module(name)
196+
spec = importer.find_spec(name)
197+
module = importlib.util.module_from_spec(spec)
198+
sys.modules[name] = module
199+
spec.loader.exec_module(module)
197200
break
198201

199202
def discover(self):

0 commit comments

Comments
 (0)