Merge pull request #83 from chennes/cleanupEmptyExcepts

Add comments to empty except clauses

Author: chennes

Addon.py

@@ -669,6 +669,7 @@ def enable(self):
         try:
             os.unlink(stopfile)
         except FileNotFoundError:
+            # If the file disappeared on us, there's no need to do anything, it's gone already
             pass
 
         if self.contains_workbench():
@@ -771,6 +772,7 @@ def _find_classname_in_file(current_file) -> str:
                 if search_result:
                     return search_result.group(1)
         except OSError:
+            # Fall through to the classname-not-found case (if we couldn't read the file, etc.)
             pass
         return ""
 

AddonManagerTest/app/test_utilities.py

@@ -43,10 +43,8 @@ class TestUtilities(unittest.TestCase):
 
     @classmethod
     def tearDownClass(cls):
-        try:
+        if os.path.exists("AM_INSTALLATION_DIGEST.txt"):
             os.remove("AM_INSTALLATION_DIGEST.txt")
-        except FileNotFoundError:
-            pass
 
     def test_recognized_git_location(self):
         recognized_urls = [

NetworkManager.py

@@ -292,6 +292,7 @@ def __setup_network_request(self):
                     self.monitored_connections.append(item.index)
                 self.__launch_request(item.index, item.request)
         except queue.Empty:
+            # Once the queue is empty, there's nothing left to do for now
             pass
 
     def __launch_request(self, index: int, request: QtNetwork.QNetworkRequest) -> None:

addonmanager_dependency_installer.py

@@ -87,8 +87,8 @@ def run(self):
             if not QtCore.QThread.currentThread().isInterruptionRequested():
                 self._install_addons()
                 self.finished_successfully = self.required_succeeded
-        except RuntimeError:
-            pass
+        except RuntimeError as e:
+            fci.Console.PrintError(str(e) + "\n")
         self.finished.emit(self.finished_successfully)
 
     def _install_python_packages(self):

addonmanager_freecad_interface.py

@@ -266,10 +266,8 @@ def __del__(self):
         if not FreeCAD and self.reference_count <= 0:
             paths = [self.data_dir, self.mod_dir, self.cache_dir, self.macro_dir, self.mod_dir]
             for path in paths:
-                try:
+                if os.path.isdir(path):
                     os.rmdir(path)
-                except FileNotFoundError:
-                    pass
             self.data_dir = None
             self.mod_dir = None
             self.cache_dir = None

addonmanager_git.py

@@ -476,5 +476,7 @@ def initialize_git() -> Optional[GitManager]:
         try:
             git_manager = GitManager()
         except NoGitFound:
+            # If git wasn't found, we call just fall through to returning the None that is already
+            # assigned to git_manager
             pass
     return git_manager

addonmanager_installer.py

@@ -164,6 +164,9 @@ def run(self, install_method: InstallationMethod = InstallationMethod.ANY) -> bo
             ):
                 self.addon_to_install.enable_workbench()
         except utils.ProcessInterrupted:
+            # This isn't really an "exception" per se, it's that the user cancelled the operation,
+            # so internally we just act like nothing bad happened, but still return false (as in,
+            # the addon was not installed).
             pass
         except Exception as e:
             fci.Console.PrintLog(str(e) + "\n")

addonmanager_utilities.py

@@ -444,10 +444,8 @@ def blocking_get(url: str, method=None) -> bytes:
         NetworkManager.InitializeNetworkManager()
         p = NetworkManager.AM_NETWORK_MANAGER.blocking_get(url, 10000)  # 10 second timeout
         if p:
-            try:
+            if hasattr(p, "data"):
                 p = p.data()
-            except AttributeError:
-                pass
     elif requests and method is None or method == "requests":
         response = requests.get(url)
         if response.status_code == 200:
@@ -564,11 +562,9 @@ def remove_options_and_arg(call_args: List[str], deny_args: List[str]) -> List[s
     as --target and --path. We then have to remove e.g. target --path and
     its argument, if present."""
     for deny_arg in deny_args:
-        try:
+        if deny_arg in call_args:
             index = call_args.index(deny_arg)
             del call_args[index : index + 2]  # The option and its argument
-        except ValueError:
-            pass
     return call_args
 
 

addonmanager_workers_startup.py

@@ -863,6 +863,7 @@ def update_and_advance(self, repo: Optional[Addon]) -> None:
                 )
             worker.start()
         except queue.Empty:
+            # If the queue is empty it's not actually an error, it's an expected end condition
             pass
 
     def terminate(self, worker) -> None: