From 266b837642d229c746301d4ad4d73ee44fd90402 Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Wed, 24 Jun 2026 01:45:12 +0200 Subject: [PATCH] remove old compat code --- src/backend/InvenTree/plugin/helpers.py | 15 +++++---------- src/backend/InvenTree/plugin/registry.py | 12 +++--------- 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/src/backend/InvenTree/plugin/helpers.py b/src/backend/InvenTree/plugin/helpers.py index edf26ba678..485f8c91b8 100644 --- a/src/backend/InvenTree/plugin/helpers.py +++ b/src/backend/InvenTree/plugin/helpers.py @@ -108,9 +108,6 @@ def handle_error(error, do_raise: bool = True, do_log: bool = True, log_name: st def get_entrypoints(): """Returns list for entrypoints for InvenTree plugins.""" - # on python before 3.12, we need to use importlib_metadata - if sys.version_info < (3, 12): - return entry_points().get('inventree_plugins', []) return entry_points(group='inventree_plugins') @@ -190,13 +187,11 @@ def get_modules(pkg, path=None): continue try: - if sys.version_info < (3, 12): - module = finder.find_module(name).load_module(name) - else: - spec = finder.find_spec(name, path) - module = module_from_spec(spec) - sys.modules[name] = module - spec.loader.exec_module(module) + spec = finder.find_spec(name, path) + module = module_from_spec(spec) + sys.modules[name] = module + spec.loader.exec_module(module) + pkg_names = getattr(module, '__all__', None) for k, v in vars(module).items(): if not k.startswith('_') and (pkg_names is None or k in pkg_names): diff --git a/src/backend/InvenTree/plugin/registry.py b/src/backend/InvenTree/plugin/registry.py index 46e57f0c10..4cac88f05b 100644 --- a/src/backend/InvenTree/plugin/registry.py +++ b/src/backend/InvenTree/plugin/registry.py @@ -585,15 +585,9 @@ class PluginsRegistry: # Gather Modules if parent_path: - # On python 3.12 use new loader method - if sys.version_info < (3, 12): - raw_module = _load_source( - plugin_dir, str(parent_obj.joinpath('__init__.py')) - ) - else: - raw_module = SourceFileLoader( - plugin_dir, str(parent_obj.joinpath('__init__.py')) - ).load_module() + raw_module = SourceFileLoader( + plugin_dir, str(parent_obj.joinpath('__init__.py')) + ).load_module() else: raw_module = importlib.import_module(plugin_dir)