Fix redundant exception

okorach · okorach · commit de781d8dfe4e · 2024-10-12T16:11:20.000+02:00
diff --git a/cli/findings_export.py b/cli/findings_export.py
@@ -294,7 +294,7 @@ def __get_component_findings(queue: Queue[tuple[object, ConfigSettings]], write_
                 findings_list = findings.export_findings(
                     component.endpoint, component.key, branch=params.get("branch", None), pull_request=params.get("pullRequest", None)
                 )
-            except (HTTPError, ConnectionError, RequestException) as e:
+            except (ConnectionError, RequestException) as e:
                 log.critical("%s while exporting findings of %s, skipped", util.error_msg(e), str(component))
                 findings_list = {}
             write_queue.put([findings_list, False])
@@ -323,7 +323,7 @@ def __get_component_findings(queue: Queue[tuple[object, ConfigSettings]], write_
             if (i_statuses or not status_list) and (i_resols or not resol_list) and (i_types or not type_list) and (i_sevs or not sev_list):
                 try:
                     findings_list = component.get_issues(filters=new_params)
-                except (HTTPError, ConnectionError, RequestException) as e:
+                except (ConnectionError, RequestException) as e:
                     log.critical("%s while exporting issues of %s, skipped", util.error_msg(e), str(component))
                     findings_list = {}
             else:
@@ -333,7 +333,7 @@ def __get_component_findings(queue: Queue[tuple[object, ConfigSettings]], write_
             if (h_statuses or not status_list) and (h_resols or not resol_list) and (h_types or not type_list) and (h_sevs or not sev_list):
                 try:
                     findings_list.update(component.get_hotspots(filters=new_params))
-                except (HTTPError, ConnectionError, RequestException) as e:
+                except (ConnectionError, RequestException) as e:
                     log.error("%s while exporting hotspots of object key %s, skipped", util.error_msg(e), str(component))
             else:
                 log.debug("Status = %s, Types = %s, Resol = %s, Sev = %s", str(h_statuses), str(h_types), str(h_resols), str(h_sevs))
@@ -351,7 +351,7 @@ def store_findings(components_list: dict[str, object], params: ConfigSettings) -
         try:
             log.debug("Queue %s task %s put", str(my_queue), str(comp))
             my_queue.put((comp, params.copy()))
-        except (HTTPError, ConnectionError, RequestException) as e:
+        except (ConnectionError, RequestException) as e:
             log.critical("%s while exporting findings of %s, skipped", util.error_msg(e), str(comp))
 
     threads = params.get(options.NBR_THREADS, 4)
diff --git a/cli/loc.py b/cli/loc.py
@@ -51,7 +51,7 @@ def __get_csv_row(o: object, **kwargs) -> tuple[list[str], str]:
     """Returns CSV row of object"""
     try:
         loc = o.loc()
-    except (HTTPError, ConnectionError, RequestException) as e:
+    except (ConnectionError, RequestException) as e:
         log.warning("%s, LoC export of %s skipped", util.error_msg(e), str(o))
         loc = ""
     arr = [o.key, loc]
@@ -113,7 +113,7 @@ def __get_object_json_data(o: object, **kwargs) -> dict[str, str]:
         d = {parent_type: o.concerned_object.key, "branch": o.name, "ncloc": ""}
     try:
         d["ncloc"] = o.loc()
-    except (HTTPError, ConnectionError, RequestException) as e:
+    except (ConnectionError, RequestException) as e:
         log.warning("%s, LoC export of %s skipped", util.error_msg(e), str(o))
     if kwargs[options.WITH_NAME]:
         d[f"{parent_type}Name"] = o.name
diff --git a/cli/measures_export.py b/cli/measures_export.py
@@ -282,7 +282,7 @@ def __get_measures(obj: object, wanted_metrics: types.KeyList, hist: bool) -> Un
             data.update(__get_json_measures_history(obj, wanted_metrics))
         else:
             data.update(__get_object_measures(obj, wanted_metrics))
-    except (HTTPError, ConnectionError, RequestException) as e:
+    except (ConnectionError, RequestException) as e:
         log.error("%s, measures export skipped for %s", util.error_msg(e), str(obj))
         return None
     return data
diff --git a/sonar/app_branches.py b/sonar/app_branches.py
@@ -109,7 +109,7 @@ def create(cls, app: App, name: str, project_branches: list[Branch]) -> Applicat
             params["projectBranch"].append(br_name)
         try:
             app.endpoint.post(APIS["create"], params=params)
-        except (HTTPError, ConnectionError, RequestException) as e:
+        except (ConnectionError, RequestException) as e:
             if e.response.status_code == HTTPStatus.BAD_REQUEST:
                 raise exceptions.ObjectAlreadyExists(f"app.App {app.key} branch '{name}", e.response.text)
             log.critical("%s while creating branch '%s' of '%s'", utilities.error_msg(e), name, str(app))
@@ -184,7 +184,7 @@ def update(self, name: str, project_branches: list[Branch]) -> bool:
             params["projectBranch"].append(br_name)
         try:
             ok = self.endpoint.post(APIS["update"], params=params).ok
-        except (HTTPError, ConnectionError, RequestException) as e:
+        except (ConnectionError, RequestException) as e:
             if e.response.status_code == HTTPStatus.NOT_FOUND:
                 raise exceptions.ObjectNotFound(str(self), e.response.text)
             log.error("%s while updating '%s'", utilities.error_msg(e), str(self))
diff --git a/sonar/applications.py b/sonar/applications.py
@@ -90,7 +90,7 @@ def get_object(cls, endpoint: pf.Platform, key: str) -> Application:
             return _OBJECTS[uu]
         try:
             data = json.loads(endpoint.get(APIS["get"], params={"application": key}).text)["application"]
-        except (HTTPError, ConnectionError, RequestException) as e:
+        except (ConnectionError, RequestException) as e:
             if e.response.status_code == HTTPStatus.NOT_FOUND:
                 raise exceptions.ObjectNotFound(key, f"Application key '{key}' not found")
             log.error("%s while getting app key '%s'", util.error_msg(e), key)
@@ -133,7 +133,7 @@ def create(cls, endpoint: pf.Platform, key: str, name: str) -> Application:
         check_supported(endpoint)
         try:
             endpoint.post(APIS["create"], params={"key": key, "name": name})
-        except (HTTPError, ConnectionError, RequestException) as e:
+        except (ConnectionError, RequestException) as e:
             if e.response.status_code == HTTPStatus.BAD_REQUEST:
                 raise exceptions.ObjectAlreadyExists(key, e.response.text)
             log.critical("%s while creating app key '%s'", util.error_msg(e), key)
@@ -150,7 +150,7 @@ def refresh(self) -> None:
         try:
             self.reload(json.loads(self.get("navigation/component", params={"component": self.key}).text))
             self.reload(json.loads(self.get(APIS["get"], params=self.search_params()).text)["application"])
-        except (HTTPError, ConnectionError, RequestException) as e:
+        except (ConnectionError, RequestException) as e:
             if e.response.status_code == HTTPStatus.NOT_FOUND:
                 _OBJECTS.pop(self.uuid(), None)
                 raise exceptions.ObjectNotFound(self.key, f"{str(self)} not found")
@@ -388,7 +388,7 @@ def add_projects(self, project_list: list[str]) -> bool:
             try:
                 r = self.post("applications/add_project", params={"application": self.key, "project": proj})
                 ok = ok and r.ok
-            except (HTTPError, ConnectionError, RequestException) as e:
+            except (ConnectionError, RequestException) as e:
                 if e.response.status_code == HTTPStatus.NOT_FOUND:
                     log.warning("Project '%s' not found, can't be added to %s", proj, self)
                     ok = False
diff --git a/sonar/branches.py b/sonar/branches.py
@@ -89,7 +89,7 @@ def get_object(cls, concerned_object: projects.Project, branch_name: str) -> Bra
             return _OBJECTS[uu]
         try:
             data = json.loads(concerned_object.endpoint.get(APIS["list"], params={"project": concerned_object.key}).text)
-        except (HTTPError, ConnectionError, RequestException) as e:
+        except (ConnectionError, RequestException) as e:
             if isinstance(HTTPError, e) and e.response.status_code == HTTPStatus.NOT_FOUND:
                 raise exceptions.ObjectNotFound(concerned_object.key, f"Project '{concerned_object.key}' not found")
             log.critical("%s while getting branch '%s' of %s", util.error_msg(e), branch_name, str(concerned_object))
@@ -129,7 +129,7 @@ def refresh(self) -> Branch:
         """
         try:
             data = json.loads(self.get(APIS["list"], params={"project": self.concerned_object.key}).text)
-        except (HTTPError, ConnectionError, RequestException) as e:
+        except (ConnectionError, RequestException) as e:
             if isinstance(HTTPError, e) and e.response.status_code == HTTPStatus.NOT_FOUND:
                 raise exceptions.ObjectNotFound(self.key, f"{str(self)} not found in SonarQube")
             log.error("%s while refreshing %s", util.error_msg(e), str(self))
@@ -185,7 +185,7 @@ def delete(self) -> bool:
         """
         try:
             return sq.delete_object(self, APIS["delete"], {"branch": self.name, "project": self.concerned_object.key}, _OBJECTS)
-        except (HTTPError, ConnectionError, RequestException) as e:
+        except (ConnectionError, RequestException) as e:
             if isinstance(e, HTTPError) and e.response.status_code == HTTPStatus.BAD_REQUEST:
                 log.warning("Can't delete %s, it's the main branch", str(self))
             else:
@@ -202,7 +202,7 @@ def new_code(self) -> str:
         elif self._new_code is None:
             try:
                 data = json.loads(self.get(api=APIS["get_new_code"], params={"project": self.concerned_object.key}).text)
-            except (HTTPError, ConnectionError, RequestException) as e:
+            except (ConnectionError, RequestException) as e:
                 if isinstance(e, HTTPError) and e.response.status_code == HTTPStatus.NOT_FOUND:
                     raise exceptions.ObjectNotFound(self.concerned_object.key, f"{str(self.concerned_object)} not found")
                 log.error("%s while getting new code period of %s", util.error_msg(e), str(self))
@@ -265,7 +265,7 @@ def rename(self, new_name):
         log.info("Renaming main branch of %s from '%s' to '%s'", str(self.concerned_object), self.name, new_name)
         try:
             self.post(APIS["rename"], params={"project": self.concerned_object.key, "name": new_name})
-        except (HTTPError, ConnectionError, RequestException) as e:
+        except (ConnectionError, RequestException) as e:
             if isinstance(HTTPError, e) and e.response.status_code == HTTPStatus.NOT_FOUND:
                 raise exceptions.ObjectNotFound(self.concerned_object.key, f"str{self.concerned_object} not found")
             log.error("%s while renaming %s", util.error_msg(e), str(self))
diff --git a/sonar/devops.py b/sonar/devops.py
@@ -109,7 +109,7 @@ def create(cls, endpoint: platform.Platform, key: str, plt_type: str, url_or_wor
             elif plt_type == "bitbucketcloud":
                 params.update({"clientSecret": _TO_BE_SET, "clientId": _TO_BE_SET, "workspace": url_or_workspace})
                 endpoint.post(_CREATE_API_BBCLOUD, params=params)
-        except (HTTPError, ConnectionError, RequestException) as e:
+        except (ConnectionError, RequestException) as e:
             if e.response.status_code == HTTPStatus.BAD_REQUEST and endpoint.edition() in ("community", "developer"):
                 log.warning("Can't set DevOps platform '%s', don't you have more that 1 of that type?", key)
                 raise exceptions.UnsupportedOperation(f"Can't set DevOps platform '{key}', don't you have more that 1 of that type?")
diff --git a/sonar/hotspots.py b/sonar/hotspots.py
@@ -402,7 +402,7 @@ def search(endpoint: pf.Platform, filters: types.ApiParams = None) -> dict[str,
             try:
                 data = json.loads(endpoint.get(Hotspot.SEARCH_API, params=inline_filters, mute=(HTTPStatus.NOT_FOUND,)).text)
                 nbr_hotspots = util.nbr_total_elements(data)
-            except (HTTPError, ConnectionError, RequestException) as e:
+            except (ConnectionError, RequestException) as e:
                 if e.response.status_code == HTTPStatus.NOT_FOUND:
                     log.warning("No hotspots found with search params %s", str(inline_filters))
                     nbr_hotspots = 0
diff --git a/sonar/measures.py b/sonar/measures.py
@@ -124,7 +124,7 @@ def get(concerned_object: object, metrics_list: KeyList, **kwargs) -> dict[str,
 
     try:
         data = json.loads(concerned_object.endpoint.get(Measure.API_READ, params={**kwargs, **params}).text)
-    except (HTTPError, ConnectionError, RequestException) as e:
+    except (ConnectionError, RequestException) as e:
         if isinstance(e, HTTPError) and e.response.status_code == HTTPStatus.NOT_FOUND:
             raise exceptions.ObjectNotFound(concerned_object.key, f"{str(concerned_object)} not found")
         log.error("%s while getting measures %s of %s", util.error_msg(e), str(metrics_list), str(concerned_object))
@@ -155,7 +155,7 @@ def get_history(concerned_object: object, metrics_list: KeyList, **kwargs) -> li
 
     try:
         data = json.loads(concerned_object.endpoint.get(Measure.API_HISTORY, params={**kwargs, **params}).text)
-    except (HTTPError, ConnectionError, RequestException) as e:
+    except (ConnectionError, RequestException) as e:
         if isinstance(e, HTTPError) and e.response.status_code == HTTPStatus.NOT_FOUND:
             raise exceptions.ObjectNotFound(concerned_object.key, f"{str(concerned_object)} not found")
         log.error("%s while getting measures %s history of %s", util.error_msg(e), str(metrics_list), str(concerned_object))
diff --git a/sonar/organizations.py b/sonar/organizations.py
@@ -78,7 +78,7 @@ def get_object(cls, endpoint: pf.Platform, key: str) -> Organization:
             return _OBJECTS[uu]
         try:
             data = json.loads(endpoint.get(Organization.SEARCH_API, params={"organizations": key}).text)
-        except (HTTPError, ConnectionError, RequestException) as e:
+        except (ConnectionError, RequestException) as e:
             if isinstance(e, HTTPError) and e.response.status_code == HTTPStatus.NOT_FOUND:
                 raise exceptions.ObjectNotFound(key, f"Organization '{key}' not found")
             log.error("%s getting organization %s", util.error_msg(e), key)
diff --git a/sonar/permissions/permission_templates.py b/sonar/permissions/permission_templates.py
@@ -141,7 +141,7 @@ def set_as_default(self, what_list: list[str]) -> None:
                 continue
             try:
                 self.post("permissions/set_default_template", params={"templateId": self.key, "qualifier": qual})
-            except (HTTPError, ConnectionError, RequestException) as e:
+            except (ConnectionError, RequestException) as e:
                 log.error("%s while setting %s as default", utilities.error_msg(e), str(self))
                 raise
 
diff --git a/sonar/permissions/permissions.py b/sonar/permissions/permissions.py
@@ -239,7 +239,7 @@ def _get_api(self, api: str, perm_type: str, ret_field: str, **extra_params) ->
                     else:
                         counter += 1
                 page, nbr_pages = page + 1, utilities.nbr_pages(data)
-            except (HTTPError, ConnectionError, RequestException) as e:
+            except (ConnectionError, RequestException) as e:
                 log.error("%s while retrieving %s permissions", utilities.error_msg(e), str(self))
                 page += 1
         return perms
@@ -256,7 +256,7 @@ def _post_api(self, api: str, set_field: str, perms_dict: types.JsonPermissions,
                 params["permission"] = p
                 try:
                     r = self.endpoint.post(api, params=params)
-                except (HTTPError, ConnectionError, RequestException) as e:
+                except (ConnectionError, RequestException) as e:
                     log.error("%s while setting permissions %s", utilities.error_msg(e), str(self))
                 result = result and r.ok
         return result
diff --git a/sonar/permissions/quality_permissions.py b/sonar/permissions/quality_permissions.py
@@ -76,7 +76,7 @@ def _get_api(self, api: str, perm_type: tuple[str, ...], ret_field: str, **extra
                 data = json.loads(resp.text)
                 perms += [p[ret_field] for p in data[perm_type]]
                 page, nbr_pages = page + 1, utilities.nbr_pages(data)
-            except (HTTPError, ConnectionError, RequestException) as e:
+            except (ConnectionError, RequestException) as e:
                 log.error("%s while retrieving %s permissions", utilities.error_msg(e), str(self))
                 page += 1
         return perms
diff --git a/sonar/platform.py b/sonar/platform.py
@@ -104,7 +104,7 @@ def __credentials(self) -> tuple[str, str]:
     def verify_connection(self) -> None:
         try:
             self.get("server/version")
-        except (HTTPError, ConnectionError, RequestException) as e:
+        except (ConnectionError, RequestException) as e:
             log.critical("%s while verifying connection", util.error_msg(e))
             raise exceptions.ConnectionError(util.sonar_error(e.response))
 
@@ -285,7 +285,7 @@ def sys_info(self) -> dict[str, any]:
                 try:
                     resp = self.get("system/info", mute=(HTTPStatus.INTERNAL_SERVER_ERROR,))
                     success = True
-                except (HTTPError, ConnectionError, RequestException) as e:
+                except (ConnectionError, RequestException) as e:
                     # Hack: SonarQube randomly returns Error 500 on this API, retry up to 10 times
                     if isinstance(e, HTTPError) and e.response.status_code == HTTPStatus.INTERNAL_SERVER_ERROR and counter < 10:
                         log.error("HTTP Error 500 for api/system/info, retrying...")
diff --git a/sonar/portfolio_reference.py b/sonar/portfolio_reference.py
@@ -73,7 +73,7 @@ def create(cls, reference: object, parent: object, params: types.ApiParams = Non
 
         try:
             parent.endpoint.post("views/add_portfolio", params={"portfolio": parent.key, "reference": reference.key})
-        except (HTTPError, ConnectionError, RequestException) as e:
+        except (ConnectionError, RequestException) as e:
             if isinstance(e, HTTPError) and e.response.status_code == HTTPStatus.BAD_REQUEST:
                 raise exceptions.ObjectAlreadyExists
             log.critical("%s while creating portfolio reference to %s in %s", utilities.error_msg(e), str(reference), str(parent))
diff --git a/sonar/portfolios.py b/sonar/portfolios.py
diff --git a/sonar/projects.py b/sonar/projects.py
diff --git a/sonar/qualitygates.py b/sonar/qualitygates.py
diff --git a/sonar/qualityprofiles.py b/sonar/qualityprofiles.py
diff --git a/sonar/rules.py b/sonar/rules.py
diff --git a/sonar/settings.py b/sonar/settings.py
diff --git a/sonar/sqobject.py b/sonar/sqobject.py
