From 3dab1ab73674caa355a9ac9ccb798682b0b3a292 Mon Sep 17 00:00:00 2001 From: Matthias Date: Wed, 12 Jan 2022 00:56:18 +0100 Subject: [PATCH] remove unneeded branches --- InvenTree/plugin/plugins.py | 15 +++------------ InvenTree/plugin/registry.py | 2 +- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/InvenTree/plugin/plugins.py b/InvenTree/plugin/plugins.py index 65ca8e29d9..0d51442d45 100644 --- a/InvenTree/plugin/plugins.py +++ b/InvenTree/plugin/plugins.py @@ -2,24 +2,15 @@ """general functions for plugin handeling""" import inspect -import importlib import pkgutil from django.core.exceptions import AppRegistryNotReady -def iter_namespace(pkg): - """get all modules in a package""" - return pkgutil.iter_modules(pkg.__path__, pkg.__name__ + ".") - - -def get_modules(pkg, recursive: bool = False): +def get_modules(pkg): """get all modules in a package""" from plugin.helpers import log_error - if not recursive: - return [importlib.import_module(name) for finder, name, ispkg in iter_namespace(pkg)] - context = {} for loader, name, ispkg in pkgutil.walk_packages(pkg.__path__): try: @@ -45,7 +36,7 @@ def get_classes(module): return inspect.getmembers(module, inspect.isclass) -def get_plugins(pkg, baseclass, recursive: bool = False): +def get_plugins(pkg, baseclass): """ Return a list of all modules under a given package. @@ -55,7 +46,7 @@ def get_plugins(pkg, baseclass, recursive: bool = False): plugins = [] - modules = get_modules(pkg, recursive) + modules = get_modules(pkg) # Iterate through each module in the package for mod in modules: diff --git a/InvenTree/plugin/registry.py b/InvenTree/plugin/registry.py index 151868f77c..6c43296c76 100644 --- a/InvenTree/plugin/registry.py +++ b/InvenTree/plugin/registry.py @@ -177,7 +177,7 @@ class PluginsRegistry: # Collect plugins from paths for plugin in settings.PLUGIN_DIRS: - modules = inventree_plugins.get_plugins(importlib.import_module(plugin), IntegrationPluginBase, True) + modules = inventree_plugins.get_plugins(importlib.import_module(plugin), IntegrationPluginBase) if modules: [self.plugin_modules.append(item) for item in modules]