From 79da22562263d8ce4cb47bf0f27c164280947dcb Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Mon, 7 Dec 2020 13:04:58 +0100
Subject: [PATCH] fixed imports in ftrack subprocesses

---
 pype/modules/ftrack/ftrack_server/lib.py      | 70 -------------------
 .../ftrack_server/sub_event_processor.py      |  4 +-
 .../ftrack/ftrack_server/sub_event_status.py  |  6 +-
 .../ftrack/ftrack_server/sub_user_server.py   |  4 +-
 4 files changed, 8 insertions(+), 76 deletions(-)

diff --git a/pype/modules/ftrack/ftrack_server/lib.py b/pype/modules/ftrack/ftrack_server/lib.py
index 1978d4529e..0a65af843b 100644
--- a/pype/modules/ftrack/ftrack_server/lib.py
+++ b/pype/modules/ftrack/ftrack_server/lib.py
@@ -41,76 +41,6 @@ TOPIC_STATUS_SERVER_RESULT = "pype.event.server.status.result"
 log = Logger().get_logger("ftrack_server.lib")
 
 
-def clockify_event_path():
-    api_key = os.environ.get("CLOCKIFY_API_KEY")
-    if not api_key:
-        log.warning("Clockify API key is not set.")
-        return
-
-    workspace_name = os.environ.get("CLOCKIFY_WORKSPACE")
-    if not workspace_name:
-        log.warning("Clockify Workspace is not set.")
-        return
-
-    from pype.modules.clockify.constants import CLOCKIFY_FTRACK_SERVER_PATH
-
-    return CLOCKIFY_FTRACK_SERVER_PATH
-
-
-def get_server_event_handler_paths():
-    paths = []
-    # Add pype's default dir
-    paths.append(SERVER_HANDLERS_DIR)
-    # Add additional paths from settings
-    paths.extend(
-        get_system_settings()
-        ["modules"]
-        ["Ftrack"]
-        ["ftrack_events_path"]
-    )
-    try:
-        clockify_path = clockify_event_path()
-        if clockify_path:
-            paths.append(clockify_path)
-    except Exception:
-        log.warning("Clockify paths function failed.", exc_info=True)
-
-    # Filter only existing paths
-    _paths = []
-    for path in paths:
-        if os.path.exists(path):
-            _paths.append(path)
-        else:
-            log.warning((
-                "Registered event handler path is not accessible: {}"
-            ).format(path))
-    return _paths
-
-
-def get_user_event_handler_paths():
-    paths = []
-    # Add pype's default dir
-    paths.append(USER_HANDLERS_DIR)
-    # Add additional paths from settings
-    paths.extend(
-        get_system_settings()
-        ["modules"]
-        ["Ftrack"]
-        ["ftrack_actions_path"]
-    )
-
-    # Filter only existing paths
-    _paths = []
-    for path in paths:
-        if os.path.exists(path):
-            _paths.append(path)
-        else:
-            log.warning((
-                "Registered event handler path is not accessible: {}"
-            ).format(path))
-    return _paths
-
-
 def get_ftrack_event_mongo_info():
     database_name = (
         os.environ.get("FTRACK_EVENTS_MONGO_DB") or "pype"
diff --git a/pype/modules/ftrack/ftrack_server/sub_event_processor.py b/pype/modules/ftrack/ftrack_server/sub_event_processor.py
index 536ac3faf2..6cf0ccf63b 100644
--- a/pype/modules/ftrack/ftrack_server/sub_event_processor.py
+++ b/pype/modules/ftrack/ftrack_server/sub_event_processor.py
@@ -8,9 +8,9 @@ from ftrack_server import FtrackServer
 from pype.modules.ftrack.ftrack_server.lib import (
     SocketSession,
     ProcessEventHub,
-    TOPIC_STATUS_SERVER,
-    get_server_event_handler_paths
+    TOPIC_STATUS_SERVER
 )
+from pype.modules.ftrack.lib import get_server_event_handler_paths
 
 from pype.api import Logger
 
diff --git a/pype/modules/ftrack/ftrack_server/sub_event_status.py b/pype/modules/ftrack/ftrack_server/sub_event_status.py
index e478c1a1e8..a398b019eb 100644
--- a/pype/modules/ftrack/ftrack_server/sub_event_status.py
+++ b/pype/modules/ftrack/ftrack_server/sub_event_status.py
@@ -9,8 +9,10 @@ import datetime
 import ftrack_api
 from ftrack_server import FtrackServer
 from pype.modules.ftrack.ftrack_server.lib import (
-    SocketSession, StatusEventHub,
-    TOPIC_STATUS_SERVER, TOPIC_STATUS_SERVER_RESULT
+    SocketSession,
+    StatusEventHub,
+    TOPIC_STATUS_SERVER,
+    TOPIC_STATUS_SERVER_RESULT
 )
 from pype.api import Logger
 
diff --git a/pype/modules/ftrack/ftrack_server/sub_user_server.py b/pype/modules/ftrack/ftrack_server/sub_user_server.py
index d899e93a8f..2686c74c2e 100644
--- a/pype/modules/ftrack/ftrack_server/sub_user_server.py
+++ b/pype/modules/ftrack/ftrack_server/sub_user_server.py
@@ -5,9 +5,9 @@ import socket
 from ftrack_server import FtrackServer
 from pype.modules.ftrack.ftrack_server.lib import (
     SocketSession,
-    SocketBaseEventHub,
-    get_user_event_handler_paths
+    SocketBaseEventHub
 )
+from pype.modules.ftrack.lib import get_user_event_handler_paths
 
 from pype.api import Logger