From 15172d32e3295b2f404c18cdabb32eeac800e85c Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Wed, 30 Sep 2020 11:12:23 +0200
Subject: [PATCH] modified imports inside ftrack module to be explicit

---
 pype/modules/ftrack/__init__.py                      | 12 +++++++++++-
 pype/modules/ftrack/ftrack_server/__init__.py        |  6 ++++++
 pype/modules/ftrack/ftrack_server/lib.py             |  2 +-
 .../modules/ftrack/ftrack_server/sub_event_storer.py | 10 ++++++----
 pype/modules/ftrack/lib/ftrack_base_handler.py       |  6 +++---
 pype/modules/ftrack/tray/login_dialog.py             |  2 +-
 6 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/pype/modules/ftrack/__init__.py b/pype/modules/ftrack/__init__.py
index aa8f04bffb..fad771f084 100644
--- a/pype/modules/ftrack/__init__.py
+++ b/pype/modules/ftrack/__init__.py
@@ -1,2 +1,12 @@
-from .lib import *
+from . import ftrack_server
 from .ftrack_server import FtrackServer, check_ftrack_url
+from .lib import BaseHandler, BaseEvent, BaseAction
+
+__all__ = (
+    "ftrack_server",
+    "FtrackServer",
+    "check_ftrack_url",
+    "BaseHandler",
+    "BaseEvent",
+    "BaseAction"
+)
diff --git a/pype/modules/ftrack/ftrack_server/__init__.py b/pype/modules/ftrack/ftrack_server/__init__.py
index fcae4e0690..9e3920b500 100644
--- a/pype/modules/ftrack/ftrack_server/__init__.py
+++ b/pype/modules/ftrack/ftrack_server/__init__.py
@@ -1,2 +1,8 @@
 from .ftrack_server import FtrackServer
 from .lib import check_ftrack_url
+
+
+__all__ = (
+    "FtrackServer",
+    "check_ftrack_url"
+)
diff --git a/pype/modules/ftrack/ftrack_server/lib.py b/pype/modules/ftrack/ftrack_server/lib.py
index 3a1c742ae8..79b708b17a 100644
--- a/pype/modules/ftrack/ftrack_server/lib.py
+++ b/pype/modules/ftrack/ftrack_server/lib.py
@@ -26,7 +26,7 @@ from pype.api import (
     compose_url
 )
 
-from pype.modules.ftrack.lib.custom_db_connector import CustomDbConnector
+from .custom_db_connector import CustomDbConnector
 
 
 TOPIC_STATUS_SERVER = "pype.event.server.status"
diff --git a/pype/modules/ftrack/ftrack_server/sub_event_storer.py b/pype/modules/ftrack/ftrack_server/sub_event_storer.py
index 1635f6cea3..2f4395c8db 100644
--- a/pype/modules/ftrack/ftrack_server/sub_event_storer.py
+++ b/pype/modules/ftrack/ftrack_server/sub_event_storer.py
@@ -12,7 +12,9 @@ from pype.modules.ftrack.ftrack_server.lib import (
     get_ftrack_event_mongo_info,
     TOPIC_STATUS_SERVER, TOPIC_STATUS_SERVER_RESULT
 )
-from pype.modules.ftrack.lib.custom_db_connector import CustomDbConnector
+from pype.modules.ftrack.ftrack_server.custom_db_connector import (
+    CustomDbConnector
+)
 from pype.api import Logger
 
 log = Logger().get_logger("Event storer")
@@ -23,8 +25,8 @@ class SessionFactory:
     session = None
 
 
-uri, port, database, table_name = get_ftrack_event_mongo_info()
-dbcon = CustomDbConnector(uri, database, port, table_name)
+uri, port, database, collection_name = get_ftrack_event_mongo_info()
+dbcon = CustomDbConnector(uri, database, port, collection_name)
 
 # ignore_topics = ["ftrack.meta.connected"]
 ignore_topics = []
@@ -200,7 +202,7 @@ def main(args):
             "Error with Mongo access, probably permissions."
             "Check if exist database with name \"{}\""
             " and collection \"{}\" inside."
-        ).format(database, table_name))
+        ).format(database, collection_name))
         sock.sendall(b"MongoError")
 
     finally:
diff --git a/pype/modules/ftrack/lib/ftrack_base_handler.py b/pype/modules/ftrack/lib/ftrack_base_handler.py
index ce6607d6bf..d322fbaf23 100644
--- a/pype/modules/ftrack/lib/ftrack_base_handler.py
+++ b/pype/modules/ftrack/lib/ftrack_base_handler.py
@@ -2,7 +2,7 @@ import functools
 import time
 from pype.api import Logger
 import ftrack_api
-from pype.modules.ftrack.ftrack_server.lib import SocketSession
+from pype.modules.ftrack import ftrack_server
 
 
 class MissingPermision(Exception):
@@ -41,7 +41,7 @@ class BaseHandler(object):
         self.log = Logger().get_logger(self.__class__.__name__)
         if not(
             isinstance(session, ftrack_api.session.Session) or
-            isinstance(session, SocketSession)
+            isinstance(session, ftrack_server.lib.SocketSession)
         ):
             raise Exception((
                 "Session object entered with args is instance of \"{}\""
@@ -49,7 +49,7 @@ class BaseHandler(object):
             ).format(
                 str(type(session)),
                 str(ftrack_api.session.Session),
-                str(SocketSession)
+                str(ftrack_server.lib.SocketSession)
             ))
 
         self._session = session
diff --git a/pype/modules/ftrack/tray/login_dialog.py b/pype/modules/ftrack/tray/login_dialog.py
index 7730ee1609..aeed82671f 100644
--- a/pype/modules/ftrack/tray/login_dialog.py
+++ b/pype/modules/ftrack/tray/login_dialog.py
@@ -1,7 +1,7 @@
 import os
 import requests
 from avalon import style
-from pype.modules.ftrack import credentials
+from pype.modules.ftrack.lib import credentials
 from . import login_tools
 from pype.api import resources
 from Qt import QtCore, QtGui, QtWidgets