"imports Qt/PySide" reverted (#1052)

Author: eduardoChaucaGallegos

python/tank/authentication/interactive_authentication.py

@@ -26,13 +26,23 @@
 
 from .errors import AuthenticationCancelled
 from .console_authentication import ConsoleLoginHandler, ConsoleRenewSessionHandler
+from .ui_authentication import UiAuthenticationHandler
 
 from .. import LogManager
 
 import threading
 import os
 from tank.util import is_windows
 
+# When importing qt_abstraction, a lot of code is executed to detects which
+# version of Qt is being used. Running business logic at import time is not
+# something usually done by the Toolkit. The worry is that the import may fail
+# in the context of a DCC, but occur too early for the Toolkit logging to be
+# fully in place to record it.
+try:
+    from .ui.qt_abstraction import QtGui
+except Exception:
+    QtGui = None
 
 logger = LogManager.get_logger(__name__)
 
@@ -60,23 +70,16 @@ def _get_current_os_user():
             return None
 
 
-def _get_ui_state() -> bool:
+def _get_ui_state():
     """
     Returns the state of UI: do we have a ui or not.
     :returns: True or False
     """
+    if QtGui and QtGui.QApplication.instance() is not None:
+        return True
+    else:
+        return False
 
-    # When importing qt_abstraction, a lot of code is executed to detects which
-    # version of Qt is being used. Running business logic at import time is not
-    # something usually done by the Toolkit. The worry is that the import may fail
-    # in the context of a DCC, but occur too early for the Toolkit logging to be
-    # fully in place to record it.
-    try:
-        from .ui.qt_abstraction import QtGui
-    except Exception:
-        QtGui = None
-
-    return bool(QtGui and QtGui.QApplication.instance())
 
 class SessionRenewal(object):
     """
@@ -219,7 +222,6 @@ def renew_session(user):
     has_ui = _get_ui_state()
     # If we have a gui, we need gui based authentication
     if has_ui:
-        from .ui_authentication import UiAuthenticationHandler
         authenticator = UiAuthenticationHandler(
             is_session_renewal=True, session_metadata=user.get_session_metadata()
         )
@@ -255,8 +257,6 @@ def authenticate(default_host, default_login, http_proxy, fixed_host):
     #        object instead of 5 element tuple.
     # If we have a gui, we need gui based authentication
     if has_ui:
-        from .ui_authentication import UiAuthenticationHandler
-
         # If we are renewing for a background thread, use the invoker
         authenticator = UiAuthenticationHandler(
             is_session_renewal=False, fixed_host=fixed_host

python/tank/authentication/login_dialog.py

@@ -43,9 +43,9 @@
 from . import site_info
 from .sso_saml2 import (
     SsoSaml2IncompletePySide2,
+    SsoSaml2Toolkit,
     SsoSaml2MissingQtModuleError,
 )
-from .sso_saml2.sso_saml2_toolkit import SsoSaml2Toolkit
 
 from .. import LogManager
 

python/tank/authentication/sso_saml2/__init__.py

@@ -22,6 +22,11 @@
     SsoSaml2MultiSessionNotSupportedError,
 )
 
+# Classes
+from .sso_saml2 import SsoSaml2  # noqa
+
+from .sso_saml2_toolkit import SsoSaml2Toolkit  # noqa
+
 # Functions
 from .utils import (  # noqa
     get_saml_claims_expiration,

python/tank/authentication/sso_saml2/core/__init__.py

@@ -10,3 +10,6 @@
 """
 This module contains files which are shared between RV and Toolkit.
 """
+
+# Classes
+from .sso_saml2_core import SsoSaml2Core  # noqa

python/tank/authentication/sso_saml2/sso_saml2.py

@@ -16,7 +16,7 @@
 # pylint: disable=too-many-arguments
 # pylint: disable=unused-import
 
-from .core.sso_saml2_core import SsoSaml2Core  # noqa
+from .core import SsoSaml2Core  # noqa
 
 from .core.utils import (  # noqa
     set_logger_parent,

tests/authentication_tests/test_web_login.py

@@ -17,7 +17,7 @@
     skip_if_pyside_missing,
 )
 
-from tank.authentication.sso_saml2.sso_saml2_toolkit import SsoSaml2Toolkit
+from tank.authentication.sso_saml2 import SsoSaml2Toolkit
 
 
 @only_run_on_nix  # This test issues a seg-fault on Windows

tests/integration_tests/bootstrap_hook.py

@@ -202,4 +202,4 @@ def test_bootstrap_with_descriptor_hooks(self):
 
 
 if __name__ == "__main__":
-    unittest.main(failfast=True, verbosity=2)
+    ret_val = unittest.main(failfast=True, verbosity=2)

tests/integration_tests/import_sgtk.py

@@ -89,4 +89,4 @@ def test_bootstrap_more_than_once(self):
 
 
 if __name__ == "__main__":
-    unittest.main(failfast=True, verbosity=2)
+    ret_val = unittest.main(failfast=True, verbosity=2)

tests/integration_tests/multi_bootstrap.py

@@ -133,4 +133,4 @@ def test_04_bootstrap(self):
 
 
 if __name__ == "__main__":
-    unittest.main(failfast=True, verbosity=2)
+    ret_val = unittest.main(failfast=True, verbosity=2)