Remove unused import HTTPError

Author: okorach

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 (ConnectionError, RequestException) as e:
+            except (HTTPError, 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 (ConnectionError, RequestException) as e:
+                except (HTTPError, 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 (ConnectionError, RequestException) as e:
+                except (HTTPError, 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 (ConnectionError, RequestException) as e:
+        except (HTTPError, 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)

cli/loc.py

@@ -24,7 +24,7 @@
 import sys
 import csv
 import datetime
-from requests import HTTPError, RequestException
+from requests import RequestException
 
 from cli import options
 import sonar.logging as log

cli/measures_export.py

@@ -29,7 +29,7 @@
 
 from typing import Union
 
-from requests import HTTPError, RequestException
+from requests import RequestException
 from sonar.util import types
 from cli import options
 import sonar.logging as log

sonar/app_branches.py

@@ -24,7 +24,7 @@
 
 import json
 from http import HTTPStatus
-from requests import HTTPError, RequestException
+from requests import RequestException
 from requests.utils import quote
 
 import sonar.logging as log

sonar/applications.py

@@ -26,7 +26,7 @@
 from datetime import datetime
 from http import HTTPStatus
 from threading import Lock
-from requests import HTTPError, RequestException
+from requests import RequestException
 
 import sonar.logging as log
 import sonar.platform as pf

sonar/branches.py

@@ -364,7 +364,7 @@ def audit(self, audit_settings: types.ConfigSettings) -> list[Problem]:
             log.debug("Auditing %s", str(self))
             try:
                 return self.__audit_last_analysis(audit_settings) + self.__audit_zero_loc() + self.__audit_never_analyzed()
-            except (HTTPError, RequestException, Exception) as e:
+            except Exception as e:
                 log.error("%s while auditing %s, audit skipped", util.error_msg(e), str(self))
         else:
             log.debug("Branch audit disabled, skipping audit of %s", str(self))

sonar/devops.py

@@ -23,7 +23,7 @@
 from http import HTTPStatus
 import json
 
-from requests import HTTPError, RequestException
+from requests import RequestException
 
 import sonar.logging as log
 from sonar.util import types

sonar/hotspots.py

@@ -24,7 +24,7 @@
 import json
 import re
 from http import HTTPStatus
-from requests import HTTPError, RequestException
+from requests import RequestException
 import requests.utils
 
 import sonar.logging as log

sonar/issues.py

@@ -29,7 +29,6 @@
 from queue import Queue
 from threading import Thread
 import requests.utils
-from requests import HTTPError, RequestException
 
 import sonar.logging as log
 import sonar.platform as pf
@@ -732,7 +731,7 @@ def __search_thread(queue: Queue) -> None:
                 i["pullRequest"] = page_params.get("pullRequest", None)
                 issue_list[i["key"]] = get_object(endpoint=endpoint, key=i["key"], data=i)
             log.debug("Added %d issues in threaded search page %d", len(data["issues"]), page)
-        except (HTTPError, RequestException, Exception) as e:
+        except Exception as e:
             log.error("%s while searching issues, search may be incomplete", util.error_msg(e))
         queue.task_done()
 
@@ -858,7 +857,7 @@ def count_by_rule(endpoint: pf.Platform, **kwargs) -> dict[str, int]:
                 if d["val"] not in rulecount:
                     rulecount[d["val"]] = 0
                 rulecount[d["val"]] += d["count"]
-        except (HTTPError, Exception, RequestException) as e:
+        except Exception as e:
             log.error("%s while counting issues per rule, count may be incomplete", util.error_msg(e))
     return rulecount
 

sonar/permissions/permission_templates.py

@@ -22,7 +22,7 @@
 
 import json
 import re
-from requests import HTTPError, RequestException
+from requests import RequestException
 
 import sonar.logging as log
 from sonar.util import types