More specific exception types and no more silent errors

developer/bake_config.py

@@ -31,6 +31,7 @@
 from tank.descriptor import create_descriptor, is_descriptor_version_missing
 from tank.descriptor.errors import TankDescriptorError
 from tank.bootstrap import constants as bootstrap_constants
+from shotgun_api3 import ShotgunError
 import functools
 
 from utils import (
@@ -293,7 +294,7 @@ def main():
     # make sure we are properly connected
     try:
         sg_connection.find_one("HumanUser", [])
-    except Exception as e:
+    except ShotgunError as e:
         logger.error("Could not communicate with Flow Production Tracking: %s" % e)
         return 3
 

hooks/get_current_login.py

@@ -54,5 +54,6 @@ def execute(self, **kwargs):
 
                 pwd_entry = pwd.getpwuid(os.geteuid())
                 return pwd_entry[0]
-            except:
+            except Exception:
+                self.logger.debug("GetCurrentLogin hook failed.", exc_info=True)
                 return None

python/tank/api.py

@@ -296,7 +296,8 @@
             data = str(data.get("documentation_url"))
             if data == "":
                 data = None
-        except Exception:
+        except Exception as e:
+            log.debug("Cant get documentation url: %s" % e)
             data = None
 
         return data

python/tank/authentication/interactive_authentication.py

@@ -41,13 +41,14 @@
 # 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.
+logger = LogManager.get_logger(__name__)
+
 try:
     from .ui.qt_abstraction import QtGui
-except Exception:
+except ImportError as e:
+    logger.debug("Cant import QtGui: %s" % e)
     QtGui = None
 
-logger = LogManager.get_logger(__name__)
-
 
 ###############################################################################################
 # internal classes and methods
@@ -68,7 +69,8 @@
 
             pwd_entry = pwd.getpwuid(os.geteuid())
             return pwd_entry[0]
-        except:
+        except Exception as e:
+            logger.debug("Cant get current user: %s" % e)
             return None
 
 

python/tank/authentication/invoker.py

@@ -30,7 +30,8 @@
 # fully in place to record it.
 try:
     from .ui.qt_abstraction import QtCore, QtGui
-except Exception:
+except ImportError as e:
+    logger.debug("Cant import QtCore/QtGui: %s" % e)
     QtCore, QtGui = None, None
 
 

python/tank/authentication/session_cache.py

@@ -654,6 +654,6 @@
         # If the error message is empty, like httplib.HTTPException, convert
         # the class name to a string
         if len(str(e)) == 0:
-            raise Exception("Unknown error: %s" % type(e).__name__)
+            raise type(e)("Unknown error: %s" % type(e).__name__)
         else:
             raise

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

@@ -13,12 +13,10 @@
 
 from __future__ import print_function
 
-# pylint: disable=import-error
-from ...ui.qt_abstraction import QtCore, QtGui
-
-# No point in proceeding if QtGui is None.
-if QtGui is None:
-    raise ImportError("Unable to import QtGui")
+try:
+    from ...ui.qt_abstraction import QtCore, QtGui
+except ImportError:
+    raise
 
 
 class UsernamePasswordDialog(QtGui.QDialog):

python/tank/authentication/ui_authentication.py

@@ -32,7 +32,8 @@
 # fully in place to record it.
 try:
     from .login_dialog import LoginDialog
-except Exception:
+except ImportError as e:
+    logger.debug("Cant import LoginDialog: %s" % e)
     LoginDialog = None
 
 

python/tank/bootstrap/async_bootstrap.py

@@ -11,12 +11,13 @@
 # Import Qt without having to worry about the version to use.
 from ..util.qt_importer import QtImporter
 
-importer = QtImporter()
-QtCore = importer.QtCore
-QtGui = importer.QtGui
-if QtCore is None:
-    # Raise an exception when Qt is not available.
-    raise ImportError
+try:
+    importer = QtImporter()
+except ImportError:
+    raise
+else:
+    QtCore = importer.QtCore
+    QtGui = importer.QtGui
 
 
 class AsyncBootstrapWrapper(QtCore.QObject):

python/tank/commands/cache_yaml.py

@@ -86,7 +86,7 @@
 
         try:
             fh = open(pickle_path, "wb")
-        except Exception as e:
+        except OSError as e:
             raise TankError("Unable to open '%s' for writing: %s" % (pickle_path, e))
 
         try:

python/tank/commands/clone_configuration.py

@@ -280,7 +280,7 @@
         fh.write("# End of file.\n")
         fh.close()
 
-    except Exception as e:
+    except OSError as e:
         raise TankError("Could not create file system structure: %s" % e)
 
     # lastly, update the pipeline_configuration.yml file

python/tank/commands/console_utils.py

@@ -228,7 +228,7 @@
                                 param_name,
                                 answer,
                             )
-                        except Exception as e:
+                        except TankError as e:
                             log.error("Validation failed: %s" % e)
                         else:
                             input_valid = True

python/tank/commands/dump_config.py

@@ -213,7 +213,7 @@
                 log.info(
                     "Environment written to: %s" % (os.path.abspath(params["file"]))
                 )
-        except Exception as e:
+        except TankError as e:
             import traceback
 
             traceback.print_exc()
@@ -244,7 +244,7 @@
                     )
             try:
                 fh = open(path, "w")
-            except Exception as e:
+            except OSError as e:
                 raise TankError(
                     "Unable to open file: %s\n" "  Error reported: %s" % (path, e)
                 )

python/tank/commands/install.py

@@ -226,7 +226,7 @@
                 env_name, writable=True
             )
             env.set_yaml_preserve_mode(preserve_yaml)
-        except Exception as e:
+        except TankError as e:
             raise TankError(
                 "Environment '%s' could not be loaded! Error reported: %s"
                 % (env_name, e)
@@ -528,7 +528,7 @@
                 env_name, writable=True
             )
             env.set_yaml_preserve_mode(preserve_yaml)
-        except Exception as e:
+        except TankError as e:
             raise TankError(
                 "Environment '%s' could not be loaded! Error reported: %s"
                 % (env_name, e)

python/tank/commands/misc.py

@@ -70,8 +70,10 @@
                 log.debug("Deleting cache file %s..." % full_path)
                 try:
                     os.remove(full_path)
-                except:
-                    log.warning("Could not delete cache file '%s'!" % full_path)
+                except OSError as e:
+                    log.warning(
+                        "Could not delete cache file '%s'! // %s" % (full_path, e)
+                    )
 
         log.info("The PTR menu cache has been cleared.")
 
@@ -137,7 +139,7 @@
                 readline.parse_and_bind("bind ^I rl_complete")
             else:
                 readline.parse_and_bind("tab: complete")
-        except:
-            pass
+        except Exception as e:
+            msg.append(e)
 
         code.interact(banner="\n".join(msg), local=tk_locals)

python/tank/commands/move_pc.py

@@ -48,7 +48,7 @@
                     log.debug("Removing %s..." % full_path)
                     try:
                         os.remove(full_path)
-                    except Exception as e:
+                    except OSError as e:
                         log.warning(
                             "Could not delete file %s. Error Reported: %s"
                             % (full_path, e)
@@ -68,7 +68,7 @@
                     log.debug("Deleting folder %s..." % full_path)
                     try:
                         os.rmdir(full_path)
-                    except Exception as e:
+                    except OSError as e:
                         log.warning(
                             "Could not remove folder %s. Error Reported: %s"
                             % (full_path, e)
@@ -272,7 +272,7 @@
             fh.write("# End of file.\n")
             fh.close()
 
-        except Exception as e:
+        except OSError as e:
             raise TankError(
                 "Could not copy configuration! This may be because of system "
                 "permissions or system setup. This configuration will "

python/tank/commands/push_pc.py

@@ -137,8 +137,8 @@
             raise TankError("Aborted by user.")
         try:
             target_pc_id = int(answer)
-        except:
-            raise TankError("Please enter a number!")
+        except ValueError as e:
+            raise TankError("Please enter a number! // %s" % e)
 
         self._run(
             log,
@@ -230,7 +230,7 @@
         for env_name in self.tk.pipeline_configuration.get_environments():
             try:
                 env = self.tk.pipeline_configuration.get_environment(env_name)
-            except Exception as e:
+            except TankError as e:
                 raise TankError(
                     "Failed to load environment %s,"
                     " run 'tank validate' for more details, got error: %s"

python/tank/commands/setup_project.py

@@ -548,8 +548,8 @@
             raise TankError("Aborted by user.")
         try:
             project_id = int(answer)
-        except:
-            raise TankError("Please enter a number!")
+        except ValueError as e:
+            raise TankError("Please enter a number! // %s" % e)
 
         if project_id not in [x["id"] for x in projs]:
             raise TankError("Id %d was not found in the list of projects!" % project_id)

python/tank/commands/switch.py

@@ -143,7 +143,7 @@
                 env_name, writable=True
             )
             env.set_yaml_preserve_mode(preserve_yaml)
-        except Exception as e:
+        except TankError as e:
             raise TankError(
                 "Environment '%s' could not be loaded! Error reported: %s"
                 % (env_name, e)

python/tank/descriptor/io_descriptor/appstore.py

@@ -399,7 +399,7 @@
             summary = sg_version_data.get("description")
             url = sg_version_data.get("sg_detailed_release_notes").get("url")
         except Exception:
-            pass
+            log.exception("Cant get changelog.")
         return (summary, url)
 
     def _download_local(self, destination_path):

python/tank/descriptor/io_descriptor/base.py

@@ -260,7 +260,8 @@ def _find_latest_tag_by_pattern(self, version_numbers, pattern):
         for version_num in version_numbers:
             try:
                 version_split = list(map(int, version_num[1:].split(".")))
-            except Exception:
+            except Exception as e:
+                log.debug(e)
                 # this git tag is not on the expected form vX.Y.Z where X Y and Z are ints. skip.
                 continue
 

python/tank/descriptor/io_descriptor/downloadable.py

@@ -91,7 +91,7 @@
         target_parent = os.path.dirname(target)
         try:
             filesystem.ensure_folder_exists(target_parent)
-        except Exception as e:
+        except OSError as e:
             if not os.path.exists(target_parent):
                 log.error("Failed to create directory %s: %s" % (target_parent, e))
                 raise TankDescriptorIOError(
@@ -104,7 +104,7 @@
             # download completed without issue. Now create settings folder
             metadata_folder = self._get_metadata_folder(temporary_path)
             filesystem.ensure_folder_exists(metadata_folder)
-        except Exception as e:
+        except OSError as e:
             # something went wrong during the download, remove the temporary files.
             log.error(
                 "Failed to download into path %s: %s. Attempting to remove it."
@@ -141,7 +141,7 @@
                 % target
             )
 
-        except Exception as e:
+        except OSError as e:
 
             # if the target path already exists, this means someone else is either
             # moving things right now or have moved it already, so we are ok.
@@ -188,7 +188,7 @@
                     filesystem.safe_delete_folder(temporary_path)
                     move_succeeded = True
 
-                except Exception as e:
+                except OSError as e:
                     # something during the copy went wrong. Attempt to roll back the target
                     # so we aren't left with any corrupt bundle cache items.
                     if os.path.exists(target):

python/tank/descriptor/io_descriptor/git.py

@@ -34,7 +34,8 @@
         subprocess.STARTF_USESHOWWINDOW
         subprocess.SW_HIDE
         return True
-    except Exception:
+    except AttributeError as e:
+        log.debug("Terminal cant be hidden: %s" % e)
         return False
 
 
@@ -131,7 +132,7 @@
         log.debug("Checking that git exists and can be executed...")
         try:
             output = _check_output(["git", "--version"])
-        except:
+        except SubprocessCalledProcessError:
             log.exception("Unexpected error:")
             raise TankGitError(
                 "Cannot execute the 'git' command. Please make sure that git is "
@@ -291,7 +292,7 @@
             # clone repo into temp folder
             self._tmp_clone_then_execute_git_commands([], depth=1)
             log.debug("...connection established")
-        except Exception as e:
+        except (OSError, SubprocessCalledProcessError) as e:
             log.debug("...could not establish connection: %s" % e)
             can_connect = False
         return can_connect