From 073e5b55327f3e7505ebd0f1c0bf6bc499c3640c Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Thu, 10 Dec 2020 17:39:04 +0100 Subject: [PATCH] do not pass any arguments to tray_init method --- pype/modules/avalon_apps/avalon_app.py | 2 +- pype/modules/base.py | 4 ++-- pype/modules/clockify/clockify.py | 2 +- pype/modules/ftrack/ftrack_module.py | 4 ++-- pype/modules/ftrack/tray/ftrack_tray.py | 4 +--- pype/modules/idle_manager/idle_manager.py | 2 +- pype/modules/logging/logging_module.py | 2 +- pype/modules/muster/muster.py | 2 +- pype/modules/rest_api/rest_api.py | 2 +- pype/modules/standalonepublish/standalonepublish_module.py | 6 +++--- pype/modules/timers_manager/timers_manager.py | 4 ++-- pype/modules/timers_manager/widget_user_idle.py | 2 +- pype/modules/user/user_module.py | 2 +- pype/modules/websocket_server/websocket_server.py | 2 +- 14 files changed, 19 insertions(+), 21 deletions(-) diff --git a/pype/modules/avalon_apps/avalon_app.py b/pype/modules/avalon_apps/avalon_app.py index 816c3f6f67..5f1690cf91 100644 --- a/pype/modules/avalon_apps/avalon_app.py +++ b/pype/modules/avalon_apps/avalon_app.py @@ -79,7 +79,7 @@ class AvalonModule(PypeModule, ITrayModule, IRestApi): "AVALON_DB_DATA": mongodb_data_dir } - def tray_init(self, tray_widget, main_window): + def tray_init(self): # Add library tool try: from avalon.tools.libraryloader import app diff --git a/pype/modules/base.py b/pype/modules/base.py index d5f7500ca6..18529f4021 100644 --- a/pype/modules/base.py +++ b/pype/modules/base.py @@ -89,7 +89,7 @@ class ITrayModule: self.tray_initialized = True @abstractmethod - def tray_init(self, tray_widget, main_window): + def tray_init(self): """Initialization part of tray implementation. Triggered between `initialization` and `connect_with_modules`. @@ -293,7 +293,7 @@ class TrayModulesManager(ModulesManager): self.main_window = main_window self.initialize_modules() - self.tray_init(tray_widget, main_window) + self.tray_init() self.connect_modules() def get_enabled_tray_modules(self): diff --git a/pype/modules/clockify/clockify.py b/pype/modules/clockify/clockify.py index 77a30761c9..61eaaa5747 100644 --- a/pype/modules/clockify/clockify.py +++ b/pype/modules/clockify/clockify.py @@ -44,7 +44,7 @@ class ClockifyModule( "CLOCKIFY_WORKSPACE": self.workspace_name } - def tray_init(self, tray_widget, main_window): + def tray_init(self): from .widgets import ClockifySettings, MessageWidget self.MessageWidgetClass = MessageWidget diff --git a/pype/modules/ftrack/ftrack_module.py b/pype/modules/ftrack/ftrack_module.py index 01a41559d4..e610166131 100644 --- a/pype/modules/ftrack/ftrack_module.py +++ b/pype/modules/ftrack/ftrack_module.py @@ -87,9 +87,9 @@ class FtrackModule( if self.tray_module: self.tray_module.changed_user() - def tray_init(self, tray_widget, main_window): + def tray_init(self): from .tray import FtrackTrayWrapper - self.tray_module = FtrackTrayWrapper(self, tray_widget, main_window) + self.tray_module = FtrackTrayWrapper(self) def tray_menu(self, parent_menu): return self.tray_module.tray_menu(parent_menu) diff --git a/pype/modules/ftrack/tray/ftrack_tray.py b/pype/modules/ftrack/tray/ftrack_tray.py index 3e2291ce28..56133208c2 100644 --- a/pype/modules/ftrack/tray/ftrack_tray.py +++ b/pype/modules/ftrack/tray/ftrack_tray.py @@ -17,10 +17,8 @@ log = Logger().get_logger("FtrackModule", "ftrack") class FtrackTrayWrapper: - def __init__(self, module, tray_widget, main_window): + def __init__(self, module): self.module = module - self.tray_widget = tray_widget - self.parent = main_window self.thread_action_server = None self.thread_socket_server = None diff --git a/pype/modules/idle_manager/idle_manager.py b/pype/modules/idle_manager/idle_manager.py index ca9872b2ed..42b96ec7db 100644 --- a/pype/modules/idle_manager/idle_manager.py +++ b/pype/modules/idle_manager/idle_manager.py @@ -50,7 +50,7 @@ class IdleManager(PypeModule, ITrayService): self.time_callbacks = collections.defaultdict(list) self.idle_thread = None - def tray_init(self, *_a, **_kw): + def tray_init(self): return def tray_start(self): diff --git a/pype/modules/logging/logging_module.py b/pype/modules/logging/logging_module.py index a4400a610a..2aa13cc118 100644 --- a/pype/modules/logging/logging_module.py +++ b/pype/modules/logging/logging_module.py @@ -12,7 +12,7 @@ class LoggingModule(PypeModule, ITrayModule): # Tray attributes self.window = None - def tray_init(self, main_parent, parent): + def tray_init(self): try: from .tray.app import LogsWindow self.window = LogsWindow() diff --git a/pype/modules/muster/muster.py b/pype/modules/muster/muster.py index 5ea02f7541..393a10e29a 100644 --- a/pype/modules/muster/muster.py +++ b/pype/modules/muster/muster.py @@ -34,7 +34,7 @@ class MusterModule(PypeModule, ITrayModule, IRestApi): "MUSTER_REST_URL": self.muster_url } - def tray_init(self, tray_widget, main_window): + def tray_init(self): from .widget_login import MusterLogin self.widget_login = MusterLogin(self) diff --git a/pype/modules/rest_api/rest_api.py b/pype/modules/rest_api/rest_api.py index 449be5f7ed..bd9e7d2a83 100644 --- a/pype/modules/rest_api/rest_api.py +++ b/pype/modules/rest_api/rest_api.py @@ -149,7 +149,7 @@ class RestApiModule(PypeModule, ITrayService): return None return found_port - def tray_init(self, *_a, **_kw): + def tray_init(self): port = self.find_port() self.rest_api_url = "http://localhost:{}".format(port) self.rest_api_thread = RestApiThread(self, port) diff --git a/pype/modules/standalonepublish/standalonepublish_module.py b/pype/modules/standalonepublish/standalonepublish_module.py index ddd58b27d2..7b995ff093 100644 --- a/pype/modules/standalonepublish/standalonepublish_module.py +++ b/pype/modules/standalonepublish/standalonepublish_module.py @@ -17,13 +17,13 @@ class StandAlonePublishModule(PypeModule, ITrayModule): ) ] - def tray_init(self, *_a, **_kw): + def tray_init(self): return - def tray_start(self, *_a, **_kw): + def tray_start(self): return - def tray_exit(self, *_a, **_kw): + def tray_exit(self): return def tray_menu(self, parent_menu): diff --git a/pype/modules/timers_manager/timers_manager.py b/pype/modules/timers_manager/timers_manager.py index 1d135ab9ef..f4f5243f13 100644 --- a/pype/modules/timers_manager/timers_manager.py +++ b/pype/modules/timers_manager/timers_manager.py @@ -60,9 +60,9 @@ class TimersManager(PypeModule, ITrayService, IIdleManager): self.modules = [] - def tray_init(self, tray_widget, main_widget): + def tray_init(self): from .widget_user_idle import WidgetUserIdle, SignalHandler - self.widget_user_idle = WidgetUserIdle(self, tray_widget) + self.widget_user_idle = WidgetUserIdle(self) self.signal_handler = SignalHandler(self) def tray_start(self, *_a, **_kw): diff --git a/pype/modules/timers_manager/widget_user_idle.py b/pype/modules/timers_manager/widget_user_idle.py index 9edf5bc976..5e47cdaddf 100644 --- a/pype/modules/timers_manager/widget_user_idle.py +++ b/pype/modules/timers_manager/widget_user_idle.py @@ -8,7 +8,7 @@ class WidgetUserIdle(QtWidgets.QWidget): SIZE_W = 300 SIZE_H = 160 - def __init__(self, module, tray_widget): + def __init__(self, module): super(WidgetUserIdle, self).__init__() diff --git a/pype/modules/user/user_module.py b/pype/modules/user/user_module.py index d60dfed353..240ede947b 100644 --- a/pype/modules/user/user_module.py +++ b/pype/modules/user/user_module.py @@ -43,7 +43,7 @@ class UserModule(PypeModule, ITrayModule, IRestApi): self.widget_login = None self.action_show_widget = None - def tray_init(self, main_parent=None, parent=None): + def tray_init(self): from .widget_user import UserWidget self.widget_login = UserWidget(self) diff --git a/pype/modules/websocket_server/websocket_server.py b/pype/modules/websocket_server/websocket_server.py index e99265f604..a96d2f249c 100644 --- a/pype/modules/websocket_server/websocket_server.py +++ b/pype/modules/websocket_server/websocket_server.py @@ -35,7 +35,7 @@ class WebsocketModule(PypeModule, ITrayService): def connect_with_modules(self, *_a, **kw): return - def tray_init(self, *_a, **kw): + def tray_init(self): self.websocket_server = WebSocketServer() self.websocket_server.on_stop_callbacks.append( self.set_service_failed