Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove unneeded branches

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
InvenTree/plugin/plugins.py
View File

@ -2,24 +2,15 @@
"""general functions for plugin handeling""" """general functions for plugin handeling"""
import inspect import inspect
import importlib
import pkgutil import pkgutil
from django.core.exceptions import AppRegistryNotReady from django.core.exceptions import AppRegistryNotReady
def iter_namespace(pkg): def get_modules(pkg):
"""get all modules in a package"""
return pkgutil.iter_modules(pkg.__path__, pkg.__name__ + ".")
def get_modules(pkg, recursive: bool = False):
"""get all modules in a package""" """get all modules in a package"""
from plugin.helpers import log_error from plugin.helpers import log_error
if not recursive:
return [importlib.import_module(name) for finder, name, ispkg in iter_namespace(pkg)]
context = {} context = {}
for loader, name, ispkg in pkgutil.walk_packages(pkg.__path__): for loader, name, ispkg in pkgutil.walk_packages(pkg.__path__):
try: try:
@ -45,7 +36,7 @@ def get_classes(module):
return inspect.getmembers(module, inspect.isclass) 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. Return a list of all modules under a given package.
@ -55,7 +46,7 @@ def get_plugins(pkg, baseclass, recursive: bool = False):
plugins = [] plugins = []
modules = get_modules(pkg, recursive) modules = get_modules(pkg)
# Iterate through each module in the package # Iterate through each module in the package
for mod in modules: for mod in modules:

2
InvenTree/plugin/registry.py
View File

@ -177,7 +177,7 @@ class PluginsRegistry:
# Collect plugins from paths # Collect plugins from paths
for plugin in settings.PLUGIN_DIRS: 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: if modules:
[self.plugin_modules.append(item) for item in modules] [self.plugin_modules.append(item) for item in modules]