diff --git a/InvenTree/plugin/__init__.py b/InvenTree/plugin/__init__.py index 32bababe2c..35a6687628 100644 --- a/InvenTree/plugin/__init__.py +++ b/InvenTree/plugin/__init__.py @@ -3,8 +3,7 @@ Utility file to enable simper imports """ from .registry import registry -from .plugin import InvenTreePluginBase -from .integration import IntegrationPluginBase +from .plugin import InvenTreePluginBase, IntegrationPluginBase from .base.action.action import ActionPlugin from .helpers import MixinNotImplementedError, MixinImplementationError diff --git a/InvenTree/plugin/base/action/action.py b/InvenTree/plugin/base/action/action.py index fd43848cc2..f012c45116 100644 --- a/InvenTree/plugin/base/action/action.py +++ b/InvenTree/plugin/base/action/action.py @@ -5,13 +5,13 @@ import logging import warnings from plugin.base.action.mixins import ActionMixin -import plugin.integration +import plugin.plugin logger = logging.getLogger("inventree") -class ActionPlugin(ActionMixin, plugin.integration.IntegrationPluginBase): +class ActionPlugin(ActionMixin, plugin.plugin.IntegrationPluginBase): """ Legacy action definition - will be replaced Please use the new Integration Plugin API and the Action mixin diff --git a/InvenTree/plugin/registry.py b/InvenTree/plugin/registry.py index 9a007307d3..985d89a7a4 100644 --- a/InvenTree/plugin/registry.py +++ b/InvenTree/plugin/registry.py @@ -31,7 +31,7 @@ except: # pragma: no cover from maintenance_mode.core import maintenance_mode_on from maintenance_mode.core import get_maintenance_mode, set_maintenance_mode -from .integration import IntegrationPluginBase +from .plugin import IntegrationPluginBase from .helpers import handle_error, log_error, get_plugins, IntegrationPluginError