diff --git a/openpype/modules/avalon_apps/avalon_app.py b/openpype/modules/avalon_apps/avalon_app.py index 4e95f6e72b..7f130bfab1 100644 --- a/openpype/modules/avalon_apps/avalon_app.py +++ b/openpype/modules/avalon_apps/avalon_app.py @@ -1,8 +1,8 @@ import os import openpype from openpype import resources -from .. import ( - PypeModule, +from openpype.modules import PypeModule +from openpype_interfaces import ( ITrayModule, IWebServerRoutes ) diff --git a/openpype/modules/clockify/clockify_module.py b/openpype/modules/clockify/clockify_module.py index e3751c46b8..83f8d07c3a 100644 --- a/openpype/modules/clockify/clockify_module.py +++ b/openpype/modules/clockify/clockify_module.py @@ -7,8 +7,8 @@ from .constants import ( CLOCKIFY_FTRACK_USER_PATH, CLOCKIFY_FTRACK_SERVER_PATH ) -from openpype.modules import ( - PypeModule, +from openpype.modules import PypeModule +from openpype_interfaces import ( ITrayModule, IPluginPaths, IFtrackEventHandlerPaths, diff --git a/openpype/modules/deadline/deadline_module.py b/openpype/modules/deadline/deadline_module.py index 2a2fba41d6..47fd4e9656 100644 --- a/openpype/modules/deadline/deadline_module.py +++ b/openpype/modules/deadline/deadline_module.py @@ -1,6 +1,6 @@ import os -from openpype.modules import ( - PypeModule, IPluginPaths) +from openpype.modules import PypeModule +from openpype_interfaces import IPluginPaths class DeadlineModule(PypeModule, IPluginPaths): diff --git a/openpype/modules/ftrack/ftrack_module.py b/openpype/modules/ftrack/ftrack_module.py index 3685978003..6fce308b19 100644 --- a/openpype/modules/ftrack/ftrack_module.py +++ b/openpype/modules/ftrack/ftrack_module.py @@ -2,14 +2,15 @@ import os import json import collections import openpype -from openpype.modules import ( - PypeModule, - OpenPypeInterface, +from openpype.modules import PypeModule + +from openpype_interfaces import ( ITrayModule, IPluginPaths, ITimersManager, ILaunchHookPaths, - ISettingsChangeListener + ISettingsChangeListener, + IFtrackEventHandlerPaths ) from openpype.settings import SaveWarningExc diff --git a/openpype/modules/idle_manager/idle_module.py b/openpype/modules/idle_manager/idle_module.py index 9e5211a0fa..d669fcb90e 100644 --- a/openpype/modules/idle_manager/idle_module.py +++ b/openpype/modules/idle_manager/idle_module.py @@ -1,10 +1,10 @@ import platform import collections -from openpype.modules import ( - PypeModule, - OpenPypeInterface, - ITrayService +from openpype.modules import PypeModule +from openpype_interfaces import ( + ITrayService, + IIdleManager ) diff --git a/openpype/modules/log_viewer/log_view_module.py b/openpype/modules/log_viewer/log_view_module.py index dde482b04c..22826d8a54 100644 --- a/openpype/modules/log_viewer/log_view_module.py +++ b/openpype/modules/log_viewer/log_view_module.py @@ -1,5 +1,6 @@ from openpype.api import Logger -from .. import PypeModule, ITrayModule +from openpype.modules import PypeModule +from openpype_interfaces import ITrayModule class LogViewModule(PypeModule, ITrayModule): diff --git a/openpype/modules/muster/muster.py b/openpype/modules/muster/muster.py index 1a82926802..164f20054a 100644 --- a/openpype/modules/muster/muster.py +++ b/openpype/modules/muster/muster.py @@ -2,8 +2,8 @@ import os import json import appdirs import requests -from .. import ( - PypeModule, +from openpype.modules import PypeModule +from openpype_interfaces import ( ITrayModule, IWebServerRoutes ) diff --git a/openpype/modules/project_manager_action.py b/openpype/modules/project_manager_action.py index 1387aa258c..9a36d973b3 100644 --- a/openpype/modules/project_manager_action.py +++ b/openpype/modules/project_manager_action.py @@ -1,4 +1,5 @@ -from . import PypeModule, ITrayAction +from openpype.modules import PypeModule +from openpype_interfaces import ITrayAction class ProjectManagerAction(PypeModule, ITrayAction): diff --git a/openpype/modules/slack/slack_module.py b/openpype/modules/slack/slack_module.py index 9dd5a3d02b..8e6ac10037 100644 --- a/openpype/modules/slack/slack_module.py +++ b/openpype/modules/slack/slack_module.py @@ -1,6 +1,9 @@ import os -from openpype.modules import ( - PypeModule, IPluginPaths, ILaunchHookPaths) +from openpype.modules import PypeModule +from openpype_interfaces import ( + IPluginPaths, + ILaunchHookPaths +) SLACK_MODULE_DIR = os.path.dirname(os.path.abspath(__file__)) diff --git a/openpype/modules/standalonepublish_action.py b/openpype/modules/standalonepublish_action.py index 4f87f9704c..53319f9e11 100644 --- a/openpype/modules/standalonepublish_action.py +++ b/openpype/modules/standalonepublish_action.py @@ -2,7 +2,8 @@ import os import platform import subprocess from openpype.lib import get_pype_execute_args -from . import PypeModule, ITrayAction +from openpype.modules import PypeModule +from openpype_interfaces import ITrayAction class StandAlonePublishAction(PypeModule, ITrayAction): diff --git a/openpype/modules/sync_server/sync_server_module.py b/openpype/modules/sync_server/sync_server_module.py index 15de4b12e9..63f39474b1 100644 --- a/openpype/modules/sync_server/sync_server_module.py +++ b/openpype/modules/sync_server/sync_server_module.py @@ -7,7 +7,8 @@ import copy from avalon.api import AvalonMongoDB -from .. import PypeModule, ITrayModule +from openpype.modules import PypeModule +from openpype_interfaces import ITrayModule from openpype.api import ( Anatomy, get_project_settings, diff --git a/openpype/modules/timers_manager/timers_manager.py b/openpype/modules/timers_manager/timers_manager.py index f893a0f3e7..b31e14209a 100644 --- a/openpype/modules/timers_manager/timers_manager.py +++ b/openpype/modules/timers_manager/timers_manager.py @@ -1,10 +1,8 @@ import os import collections -from abc import ABCMeta, abstractmethod -import six -from .. import ( - PypeModule, - OpenPypeInterface, +from openpype.modules import PypeModule +from openpype_interfaces import ( + ITimersManager, ITrayService, IIdleManager, IWebServerRoutes diff --git a/openpype/modules/webserver/host_console_listener.py b/openpype/modules/webserver/host_console_listener.py index 01a8af643e..bcf4cadf6a 100644 --- a/openpype/modules/webserver/host_console_listener.py +++ b/openpype/modules/webserver/host_console_listener.py @@ -5,7 +5,7 @@ import logging from concurrent.futures import CancelledError from Qt import QtWidgets -from openpype.modules import ITrayService +from openpype_interfaces import ITrayService log = logging.getLogger(__name__) diff --git a/openpype/modules/webserver/webserver_module.py b/openpype/modules/webserver/webserver_module.py index 57e5df8e85..192baad013 100644 --- a/openpype/modules/webserver/webserver_module.py +++ b/openpype/modules/webserver/webserver_module.py @@ -1,14 +1,11 @@ import os import socket -from abc import ABCMeta, abstractmethod - -import six from openpype import resources -from .. import ( - PypeModule, - OpenPypeInterface, - ITrayService +from openpype.modules import PypeModule +from openpype_interfaces import ( + ITrayService, + IWebServerRoutes )