cleanup

Author: julien-lang

python/tank/authentication/login_dialog.py

@@ -208,9 +208,7 @@ def __init__(
         self._url_changed_timer = QtCore.QTimer(self)
         self._url_changed_timer.setInterval(USER_INPUT_DELAY_BEFORE_SITE_INFO_REQUEST)
         self._url_changed_timer.setSingleShot(True)
-        self._url_changed_timer.timeout.connect(
-            self._on_site_changed
-        )
+        self._url_changed_timer.timeout.connect(self._on_site_changed)
 
         # If the host is fixed, disable the site textbox.
         if fixed_host:
@@ -312,16 +310,7 @@ def __init__(
         self._query_task = QuerySiteAndUpdateUITask(self, self.site_info, http_proxy)
         self._query_task.finished.connect(self._toggle_web)
 
-###        self._update_ui_according_to_site_support()# 
-        self._on_site_changed() # trigger the first site info request
-
-        # We want to wait until we know what is supported by the site, to avoid
-        # flickering GUI.
-        # if not self._query_task.wait(THREAD_WAIT_TIMEOUT_MS):
-        #     logger.warning(
-        #         "Timed out awaiting requesting information: %s"
-        #         % self._get_current_site()
-        #     )
+        self._on_site_changed()  # trigger the first site info request
 
         # Initialize exit confirm message box
         self.confirm_box = QtGui.QMessageBox(
@@ -410,7 +399,7 @@ def _update_ui_according_to_site_support(self):
         TODO the name and description of this method are not accurate!!!!!
         """
 
-        logger.info("_update_ui_according_to_site_support") #, stack_info=True)
+        logger.debug("_update_ui_according_to_site_support")
         self._query_task.url_to_test = self._get_current_site()
         self._query_task.start()
 
@@ -428,15 +417,15 @@ def _on_site_changed(self):
         """
 
         host_selected = connection.sanitize_url(self.ui.site.currentText())
-        if host_selected ==  self.host_selected:
+        if host_selected == self.host_selected:
             logger.debug(f"_on_site_changed - site has not changed: {host_selected}")
             # No change, nothing to do.
             return
 
         self.host_selected = host_selected
 
-        # self.ui.login.clear()
-        # self._populate_user_dropdown(self._get_current_site())
+        self.ui.login.clear()  ## TODO do we really want to do that here?
+        self._populate_user_dropdown(self._get_current_site())  # same TOTO
         self._update_ui_according_to_site_support()
 
     def _populate_user_dropdown(self, site):
@@ -492,9 +481,9 @@ def _toggle_web(self, method_selected=None):
             logger.debug("_toggle_web - site-info thread finished too late, we already selected another host")
             # the thread finished too late, We already selected another host
             return
-            ## Careful, this method is called from a lot different use cases.......!!!!!!
+            # Careful, this method is called from a lot different use cases.......!!!!!!
 
-       #  self.method_selected_user = None ## WHY ?????
+        # self.method_selected_user = None ## WHY ?????
 
         # We only update the GUI if there was a change between to mode we
         # are showing and what was detected on the potential target site.
@@ -712,6 +701,14 @@ def result(self):
 
             return self._sso_saml2.get_session_data()
 
+        # We want to wait until we know what is supported by the site, to avoid
+        # flickering GUI.
+        if not self._query_task.wait(THREAD_WAIT_TIMEOUT_MS):
+            logger.warning(
+                "Timed out awaiting requesting information: %s"
+                % self._get_current_site()
+            )
+
         res = self.exec_()
         if res != QtGui.QDialog.Accepted:
             return

python/tank/authentication/session_cache.py

@@ -159,14 +159,14 @@ def _try_load_yaml_file(file_path):
     cache = _YML_CONMTENT_CACHE.get(file_path, None)
     if cache and (time.time() - _YML_CONMTENT_CACHE_TIMEOUT > cache.get("timeout", 0)):
         try:
-           del(_YML_CONMTENT_CACHE[file_path])
+            del(_YML_CONMTENT_CACHE[file_path])
         except KeyError:
             pass
 
         cache = None
 
     if not cache:
-        cache =  {
+        cache = {
             "timeout": time.time(),
             "content": _try_load_yaml_file_real(file_path),
         }
@@ -520,7 +520,7 @@ def get_current_host():
     host = document[_CURRENT_HOST]
     if host:
         host = connection.sanitize_url(host)
-    logger.debug(f'Current host is "{host}"') #, stack_info=True, stacklevel=4)
+    logger.debug(f'Current host is "{host}"')
     return host