From c2f48efe10203ce5fcf9015c30e616a5abb10388 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Wed, 4 Aug 2021 18:31:50 +0200 Subject: [PATCH] renamed PypeModule to OpenPypeModule --- openpype/modules/__init__.py | 4 ++-- openpype/modules/base.py | 10 +++++----- .../modules/default_modules/avalon_apps/avalon_app.py | 4 ++-- .../default_modules/clockify/clockify_module.py | 4 ++-- .../default_modules/deadline/deadline_module.py | 4 ++-- .../modules/default_modules/ftrack/ftrack_module.py | 4 ++-- .../default_modules/idle_manager/idle_module.py | 4 ++-- openpype/modules/default_modules/launcher_action.py | 4 ++-- .../default_modules/log_viewer/log_view_module.py | 4 ++-- openpype/modules/default_modules/muster/muster.py | 4 ++-- .../modules/default_modules/project_manager_action.py | 4 ++-- .../default_modules/settings_module/settings_action.py | 6 +++--- openpype/modules/default_modules/slack/slack_module.py | 4 ++-- .../default_modules/standalonepublish_action.py | 4 ++-- .../default_modules/sync_server/sync_server_module.py | 4 ++-- .../default_modules/timers_manager/timers_manager.py | 4 ++-- .../default_modules/webserver/webserver_module.py | 4 ++-- 17 files changed, 38 insertions(+), 38 deletions(-) diff --git a/openpype/modules/__init__.py b/openpype/modules/__init__.py index 3ad9a75161..81853faa38 100644 --- a/openpype/modules/__init__.py +++ b/openpype/modules/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- from .base import ( - PypeModule, + OpenPypeModule, OpenPypeInterface, ModulesManager, TrayModulesManager @@ -8,7 +8,7 @@ from .base import ( __all__ = ( - "PypeModule", + "OpenPypeModule", "OpenPypeInterface", "ModulesManager", diff --git a/openpype/modules/base.py b/openpype/modules/base.py index 77d9ddbcec..1f8fa6ae25 100644 --- a/openpype/modules/base.py +++ b/openpype/modules/base.py @@ -244,7 +244,7 @@ class MissingInteface(OpenPypeInterface): @six.add_metaclass(ABCMeta) -class PypeModule: +class OpenPypeModule: """Base class of pype module. Attributes: @@ -299,7 +299,7 @@ class PypeModule: return {} -class OpenPypeAddOn(PypeModule): +class OpenPypeAddOn(OpenPypeModule): pass @@ -351,11 +351,11 @@ class ModulesManager: for name in dir(module): modules_item = getattr(module, name, None) # Filter globals that are not classes which inherit from - # PypeModule + # OpenPypeModule if ( not inspect.isclass(modules_item) - or modules_item is PypeModule - or not issubclass(modules_item, PypeModule) + or modules_item is OpenPypeModule + or not issubclass(modules_item, OpenPypeModule) ): continue diff --git a/openpype/modules/default_modules/avalon_apps/avalon_app.py b/openpype/modules/default_modules/avalon_apps/avalon_app.py index 7f130bfab1..53e06ec90a 100644 --- a/openpype/modules/default_modules/avalon_apps/avalon_app.py +++ b/openpype/modules/default_modules/avalon_apps/avalon_app.py @@ -1,14 +1,14 @@ import os import openpype from openpype import resources -from openpype.modules import PypeModule +from openpype.modules import OpenPypeModule from openpype_interfaces import ( ITrayModule, IWebServerRoutes ) -class AvalonModule(PypeModule, ITrayModule, IWebServerRoutes): +class AvalonModule(OpenPypeModule, ITrayModule, IWebServerRoutes): name = "avalon" def initialize(self, modules_settings): diff --git a/openpype/modules/default_modules/clockify/clockify_module.py b/openpype/modules/default_modules/clockify/clockify_module.py index 83f8d07c3a..a9e989f4ec 100644 --- a/openpype/modules/default_modules/clockify/clockify_module.py +++ b/openpype/modules/default_modules/clockify/clockify_module.py @@ -7,7 +7,7 @@ from .constants import ( CLOCKIFY_FTRACK_USER_PATH, CLOCKIFY_FTRACK_SERVER_PATH ) -from openpype.modules import PypeModule +from openpype.modules import OpenPypeModule from openpype_interfaces import ( ITrayModule, IPluginPaths, @@ -17,7 +17,7 @@ from openpype_interfaces import ( class ClockifyModule( - PypeModule, + OpenPypeModule, ITrayModule, IPluginPaths, IFtrackEventHandlerPaths, diff --git a/openpype/modules/default_modules/deadline/deadline_module.py b/openpype/modules/default_modules/deadline/deadline_module.py index 47fd4e9656..a5e189ee52 100644 --- a/openpype/modules/default_modules/deadline/deadline_module.py +++ b/openpype/modules/default_modules/deadline/deadline_module.py @@ -1,9 +1,9 @@ import os -from openpype.modules import PypeModule +from openpype.modules import OpenPypeModule from openpype_interfaces import IPluginPaths -class DeadlineModule(PypeModule, IPluginPaths): +class DeadlineModule(OpenPypeModule, IPluginPaths): name = "deadline" def initialize(self, modules_settings): diff --git a/openpype/modules/default_modules/ftrack/ftrack_module.py b/openpype/modules/default_modules/ftrack/ftrack_module.py index 6fd2737261..1de152535c 100644 --- a/openpype/modules/default_modules/ftrack/ftrack_module.py +++ b/openpype/modules/default_modules/ftrack/ftrack_module.py @@ -2,7 +2,7 @@ import os import json import collections import openpype -from openpype.modules import PypeModule +from openpype.modules import OpenPypeModule from openpype_interfaces import ( ITrayModule, @@ -18,7 +18,7 @@ FTRACK_MODULE_DIR = os.path.dirname(os.path.abspath(__file__)) class FtrackModule( - PypeModule, + OpenPypeModule, ITrayModule, IPluginPaths, ITimersManager, diff --git a/openpype/modules/default_modules/idle_manager/idle_module.py b/openpype/modules/default_modules/idle_manager/idle_module.py index d669fcb90e..1a6d71a961 100644 --- a/openpype/modules/default_modules/idle_manager/idle_module.py +++ b/openpype/modules/default_modules/idle_manager/idle_module.py @@ -1,14 +1,14 @@ import platform import collections -from openpype.modules import PypeModule +from openpype.modules import OpenPypeModule from openpype_interfaces import ( ITrayService, IIdleManager ) -class IdleManager(PypeModule, ITrayService): +class IdleManager(OpenPypeModule, ITrayService): """ Measure user's idle time in seconds. Idle time resets on keyboard/mouse input. Is able to emit signals at specific time idle. diff --git a/openpype/modules/default_modules/launcher_action.py b/openpype/modules/default_modules/launcher_action.py index 728143ffac..e3252e3842 100644 --- a/openpype/modules/default_modules/launcher_action.py +++ b/openpype/modules/default_modules/launcher_action.py @@ -1,8 +1,8 @@ -from openpype.modules import PypeModule +from openpype.modules import OpenPypeModule from openpype_interfaces import ITrayAction -class LauncherAction(PypeModule, ITrayAction): +class LauncherAction(OpenPypeModule, ITrayAction): label = "Launcher" name = "launcher_tool" diff --git a/openpype/modules/default_modules/log_viewer/log_view_module.py b/openpype/modules/default_modules/log_viewer/log_view_module.py index 22826d8a54..bc1a98f4ad 100644 --- a/openpype/modules/default_modules/log_viewer/log_view_module.py +++ b/openpype/modules/default_modules/log_viewer/log_view_module.py @@ -1,9 +1,9 @@ from openpype.api import Logger -from openpype.modules import PypeModule +from openpype.modules import OpenPypeModule from openpype_interfaces import ITrayModule -class LogViewModule(PypeModule, ITrayModule): +class LogViewModule(OpenPypeModule, ITrayModule): name = "log_viewer" def initialize(self, modules_settings): diff --git a/openpype/modules/default_modules/muster/muster.py b/openpype/modules/default_modules/muster/muster.py index 164f20054a..a0e72006af 100644 --- a/openpype/modules/default_modules/muster/muster.py +++ b/openpype/modules/default_modules/muster/muster.py @@ -2,14 +2,14 @@ import os import json import appdirs import requests -from openpype.modules import PypeModule +from openpype.modules import OpenPypeModule from openpype_interfaces import ( ITrayModule, IWebServerRoutes ) -class MusterModule(PypeModule, ITrayModule, IWebServerRoutes): +class MusterModule(OpenPypeModule, ITrayModule, IWebServerRoutes): """ Module handling Muster Render credentials. This will display dialog asking for user credentials for Muster if not already specified. diff --git a/openpype/modules/default_modules/project_manager_action.py b/openpype/modules/default_modules/project_manager_action.py index 9a36d973b3..c1f984a8cb 100644 --- a/openpype/modules/default_modules/project_manager_action.py +++ b/openpype/modules/default_modules/project_manager_action.py @@ -1,8 +1,8 @@ -from openpype.modules import PypeModule +from openpype.modules import OpenPypeModule from openpype_interfaces import ITrayAction -class ProjectManagerAction(PypeModule, ITrayAction): +class ProjectManagerAction(OpenPypeModule, ITrayAction): label = "Project Manager (beta)" name = "project_manager" admin_action = True diff --git a/openpype/modules/default_modules/settings_module/settings_action.py b/openpype/modules/default_modules/settings_module/settings_action.py index a6909e1fdf..7140c57bab 100644 --- a/openpype/modules/default_modules/settings_module/settings_action.py +++ b/openpype/modules/default_modules/settings_module/settings_action.py @@ -1,8 +1,8 @@ -from openpype.modules import PypeModule +from openpype.modules import OpenPypeModule from openpype_interfaces import ITrayAction -class SettingsAction(PypeModule, ITrayAction): +class SettingsAction(OpenPypeModule, ITrayAction): """Action to show Setttings tool.""" name = "settings" label = "Studio Settings" @@ -71,7 +71,7 @@ class SettingsAction(PypeModule, ITrayAction): self.settings_window.reset() -class LocalSettingsAction(PypeModule, ITrayAction): +class LocalSettingsAction(OpenPypeModule, ITrayAction): """Action to show Setttings tool.""" name = "local_settings" label = "Settings" diff --git a/openpype/modules/default_modules/slack/slack_module.py b/openpype/modules/default_modules/slack/slack_module.py index 8e6ac10037..e3f7b4ad19 100644 --- a/openpype/modules/default_modules/slack/slack_module.py +++ b/openpype/modules/default_modules/slack/slack_module.py @@ -1,5 +1,5 @@ import os -from openpype.modules import PypeModule +from openpype.modules import OpenPypeModule from openpype_interfaces import ( IPluginPaths, ILaunchHookPaths @@ -8,7 +8,7 @@ from openpype_interfaces import ( SLACK_MODULE_DIR = os.path.dirname(os.path.abspath(__file__)) -class SlackIntegrationModule(PypeModule, IPluginPaths, ILaunchHookPaths): +class SlackIntegrationModule(OpenPypeModule, IPluginPaths, ILaunchHookPaths): """Allows sending notification to Slack channels during publishing.""" name = "slack" diff --git a/openpype/modules/default_modules/standalonepublish_action.py b/openpype/modules/default_modules/standalonepublish_action.py index 53319f9e11..9321a415a9 100644 --- a/openpype/modules/default_modules/standalonepublish_action.py +++ b/openpype/modules/default_modules/standalonepublish_action.py @@ -2,11 +2,11 @@ import os import platform import subprocess from openpype.lib import get_pype_execute_args -from openpype.modules import PypeModule +from openpype.modules import OpenPypeModule from openpype_interfaces import ITrayAction -class StandAlonePublishAction(PypeModule, ITrayAction): +class StandAlonePublishAction(OpenPypeModule, ITrayAction): label = "Publish" name = "standalonepublish_tool" diff --git a/openpype/modules/default_modules/sync_server/sync_server_module.py b/openpype/modules/default_modules/sync_server/sync_server_module.py index 63f39474b1..e65a410551 100644 --- a/openpype/modules/default_modules/sync_server/sync_server_module.py +++ b/openpype/modules/default_modules/sync_server/sync_server_module.py @@ -7,7 +7,7 @@ import copy from avalon.api import AvalonMongoDB -from openpype.modules import PypeModule +from openpype.modules import OpenPypeModule from openpype_interfaces import ITrayModule from openpype.api import ( Anatomy, @@ -29,7 +29,7 @@ from .utils import time_function, SyncStatus, EditableScopes log = PypeLogger().get_logger("SyncServer") -class SyncServerModule(PypeModule, ITrayModule): +class SyncServerModule(OpenPypeModule, ITrayModule): """ Synchronization server that is syncing published files from local to any of implemented providers (like GDrive, S3 etc.) diff --git a/openpype/modules/default_modules/timers_manager/timers_manager.py b/openpype/modules/default_modules/timers_manager/timers_manager.py index b31e14209a..d7dfe390a0 100644 --- a/openpype/modules/default_modules/timers_manager/timers_manager.py +++ b/openpype/modules/default_modules/timers_manager/timers_manager.py @@ -1,6 +1,6 @@ import os import collections -from openpype.modules import PypeModule +from openpype.modules import OpenPypeModule from openpype_interfaces import ( ITimersManager, ITrayService, @@ -10,7 +10,7 @@ from openpype_interfaces import ( from avalon.api import AvalonMongoDB -class TimersManager(PypeModule, ITrayService, IIdleManager, IWebServerRoutes): +class TimersManager(OpenPypeModule, ITrayService, IIdleManager, IWebServerRoutes): """ Handles about Timers. Should be able to start/stop all timers at once. diff --git a/openpype/modules/default_modules/webserver/webserver_module.py b/openpype/modules/default_modules/webserver/webserver_module.py index f81bf52410..ff3456f903 100644 --- a/openpype/modules/default_modules/webserver/webserver_module.py +++ b/openpype/modules/default_modules/webserver/webserver_module.py @@ -2,14 +2,14 @@ import os import socket from openpype import resources -from openpype.modules import PypeModule +from openpype.modules import OpenPypeModule from openpype_interfaces import ( ITrayService, IWebServerRoutes ) -class WebServerModule(PypeModule, ITrayService): +class WebServerModule(OpenPypeModule, ITrayService): name = "webserver" label = "WebServer"