From 074754698789e2dd122f86214ca65bd2bb1e7f28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 13 May 2019 22:39:27 +0200 Subject: [PATCH] Use FileFinder and SourceFileLoader to load plugins On frozen environment using import_module does not work because the plugins are not in the PYTHONPATH. issue8334 review253491002 --- tryton/plugins/__init__.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tryton/plugins/__init__.py b/tryton/plugins/__init__.py index 035aa62366..db22c616cb 100644 --- a/tryton/plugins/__init__.py +++ b/tryton/plugins/__init__.py @@ -23,15 +23,23 @@ def register(): imported = set() for path in paths: + finder = importlib.machinery.FileFinder( + path, ( + importlib.machinery.SourceFileLoader, + importlib.machinery.SOURCE_SUFFIXES)) for plugin in os.listdir(path): module = os.path.splitext(plugin)[0] if (module.startswith('_') or module in imported): continue module = 'tryton.plugins.%s' % module + spec = finder.find_spec(module) + if not spec: + continue + module = importlib.util.module_from_spec(spec) try: - module = importlib.import_module(module) - MODULES.append(module) + spec.loader.exec_module(module) except ImportError: continue else: + MODULES.append(module) imported.add(module.__name__)