Quality pass

Author: okorach-sonar

sonar/branches.py

@@ -176,7 +176,8 @@ def delete(self) -> bool:
             log.warning(e.message)
             return False
 
-    def get(self, api: str, params: types.ApiParams = None, data: str = None, mute: tuple[HTTPStatus] = (), **kwargs) -> requests.Response:
+    def get(self, api: str, params: types.ApiParams = None, data: Optional[str] = None, mute: tuple[HTTPStatus] = (), **kwargs: str) -> requests.Response:
+        """Performs an HTTP GET request for the object"""
         try:
             return super().get(api=api, params=params, data=data, mute=mute, **kwargs)
         except exceptions.ObjectNotFound as e:
@@ -185,7 +186,8 @@ def get(self, api: str, params: types.ApiParams = None, data: str = None, mute:
                 projects.Project.CACHE.clear()
             raise
 
-    def post(self, api: str, params: types.ApiParams = None, mute: tuple[HTTPStatus] = (), **kwargs) -> requests.Response:
+    def post(self, api: str, params: types.ApiParams = None, mute: tuple[HTTPStatus] = (), **kwargs: str) -> requests.Response:
+        """Performs an HTTP POST request for the object"""
         try:
             return super().post(api=api, params=params, mute=mute, **kwargs)
         except exceptions.ObjectNotFound as e:

sonar/hotspots.py

@@ -160,9 +160,10 @@ def __mark_as(self, resolution: Optional[str], comment: Optional[str] = None, st
             params = util.remove_nones({"hotspot": self.key, "status": status, "resolution": resolution, "commemt": comment})
             ok = self.post("hotspots/change_status", params=params).ok
             self.refresh()
-            return ok
         except exceptions.SonarException:
             return False
+        else:
+            return ok
 
     def mark_as_safe(self) -> bool:
         """Marks a hotspot as safe
@@ -231,9 +232,10 @@ def assign(self, assignee: Optional[str], comment: Optional[str] = None) -> bool
             ok = self.post("hotspots/assign", util.remove_nones({"hotspot": self.key, "assignee": assignee, "comment": comment})).ok
             if ok:
                 self.assignee = assignee
-            return ok
         except exceptions.SonarException:
             return False
+        else:
+            return ok
 
     def unassign(self, comment: Optional[str] = None) -> bool:
         """Unassigns a hotspot (and optionally comment)

sonar/issues.py

@@ -343,9 +343,10 @@ def assign(self, assignee: Optional[str] = None) -> bool:
             log.debug("Assigning %s to '%s'", str(self), str(assignee))
             if ok := self.post("issues/assign", params).ok:
                 self.assignee = assignee
-            return ok
         except exceptions.SonarException:
             return False
+        else:
+            return ok
 
     def get_tags(self, **kwargs) -> list[str]:
         """Returns issues tags"""
@@ -393,9 +394,10 @@ def set_type(self, new_type: str) -> bool:
         try:
             if ok := self.post("issues/set_type", {"issue": self.key, "type": new_type}).ok:
                 self.type = new_type
-            return ok
         except exceptions.SonarException:
             return False
+        else:
+            return ok
 
     def is_wont_fix(self) -> bool:
         """

sonar/permissions/permission_templates.py

@@ -148,6 +148,7 @@ def set_as_default(self, what_list: list[str]) -> bool:
                 return self.post("permissions/set_default_template", params={"templateId": self.key, "qualifier": qual}).ok
             except exceptions.SonarException:
                 return False
+        return False
 
     def set_pattern(self, pattern: str) -> PermissionTemplate:
         """Sets a permission template pattern"""

sonar/projects.py

@@ -251,10 +251,7 @@ def reload(self, data: types.ApiPayload) -> Project:
         :rtype: Project
         """
         """Loads a project object with contents of an api/projects/search call"""
-        if self.sq_json is None:
-            self.sq_json = data
-        else:
-            self.sq_json.update(data)
+        self.sq_json = (self.sq_json or {}) | data
         self.name = data["name"]
         self._visibility = data["visibility"]
         if "lastAnalysisDate" in data:

sonar/qualitygates.py

@@ -300,9 +300,10 @@ def set_as_default(self) -> bool:
             # Turn off default for all other quality gates except the current one
             for qg in get_list(self.endpoint).values():
                 qg.is_default = qg.name == self.name
-            return ok
         except exceptions.SonarException:
             return False
+        else:
+            return ok
 
     def update(self, **data) -> bool:
         """Updates a quality gate

sonar/settings.py

@@ -261,19 +261,21 @@ def set(self, value: any) -> bool:
         try:
             if ok := self.post(Setting.API[c.CREATE], params=params).ok:
                 self.value = value
-            return ok
         except exceptions.SonarException:
             return False
+        else:
+            return ok
 
     def reset(self) -> bool:
         log.info("Resetting %s", str(self))
         params = {"keys": self.key} | {} if not self.component else {"component": self.component.key}
         try:
             ok = self.post("settings/reset", params=params).ok
             self.refresh()
-            return ok
         except exceptions.SonarException:
             return False
+        else:
+            return ok
 
     def to_json(self, list_as_csv: bool = True) -> types.ObjectJsonRepr:
         val = self.value
@@ -508,10 +510,11 @@ def set_setting(endpoint: pf.Platform, key: str, value: any, component: object =
             log.warning("Setting '%s' does not exist on target platform, it cannot be set", key)
             return False
         s.set(value)
-        return True
     except exceptions.SonarException as e:
         log.error("Setting '%s' cannot be set: %s", key, e.message)
         return False
+    else:
+        return True
 
 
 def decode(setting_key: str, setting_value: any) -> any:

sonar/sqobject.py

@@ -186,11 +186,12 @@ def set_tags(self, tags: list[str]) -> bool:
         try:
             if ok := self.post(self.__class__.API[c.SET_TAGS], params={**self.api_params(c.SET_TAGS), "tags": utilities.list_to_csv(tags)}).ok:
                 self._tags = sorted(tags)
-            return ok
         except exceptions.SonarException:
             return False
         except (AttributeError, KeyError):
             raise exceptions.UnsupportedOperation(f"Can't set tags on {self.__class__.__name__.lower()}s")
+        else:
+            return ok
 
     def get_tags(self, **kwargs) -> list[str]:
         """Returns object tags"""

sonar/users.py

@@ -27,7 +27,6 @@
 import datetime as dt
 import json
 
-from http import HTTPStatus
 from requests import RequestException
 
 import sonar.logging as log