remove unneeded branches

This commit is contained in:
Matthias 2022-01-12 00:56:18 +01:00
parent 4f74ae3fce
commit 3dab1ab736
No known key found for this signature in database
GPG Key ID: F50EF5741D33E076
2 changed files with 4 additions and 13 deletions

View File

@ -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:

View File

@ -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]