Quality pass

Author: okorach-sonar

sonar/app_branches.py

@@ -22,11 +22,6 @@
 
 from __future__ import annotations
 from typing import Optional, TYPE_CHECKING
-
-if TYPE_CHECKING:
-    from sonar.util import types
-    from datetime import datetime
-
 import json
 from requests.utils import quote
 
@@ -39,6 +34,9 @@
 from sonar import exceptions, projects, utilities
 import sonar.util.constants as c
 
+if TYPE_CHECKING:
+    from sonar.util import types
+    from datetime import datetime
 
 _NOT_SUPPORTED = "Applications not supported in community edition"
 

sonar/branches.py

@@ -24,11 +24,6 @@
 from http import HTTPStatus
 from typing import Optional, TYPE_CHECKING
 
-if TYPE_CHECKING:
-    from sonar.projects import Project
-    from sonar.util import types
-    from datetime import datetime
-
 import json
 import re
 from urllib.parse import unquote
@@ -38,13 +33,16 @@
 from sonar.util import cache
 import sonar.logging as log
 from sonar import components, settings, exceptions, tasks
-from sonar import projects
+from sonar.projects import Project
 import sonar.utilities as util
 
 from sonar.audit.problem import Problem
 from sonar.audit.rules import get_rule, RuleId
 import sonar.util.constants as c
 
+if TYPE_CHECKING:
+    from sonar.util import types
+    from datetime import datetime
 
 _UNSUPPORTED_IN_CE = "Branches not available in Community Edition"
 

sonar/findings.py

@@ -23,10 +23,6 @@
 import concurrent.futures
 from typing import Optional, TYPE_CHECKING
 
-if TYPE_CHECKING:
-    from datetime import datetime
-    from sonar.util import types
-
 import re
 import Levenshtein
 
@@ -38,7 +34,11 @@
 
 import sonar.utilities as util
 from sonar import projects, rules
-from sonar.changelog import Changelog
+
+if TYPE_CHECKING:
+    from datetime import datetime
+    from sonar.util import types
+    from sonar.changelog import Changelog
 
 _JSON_FIELDS_REMAPPED = (("pull_request", "pullRequest"), ("_comments", "comments"))
 

sonar/measures.py

@@ -171,7 +171,7 @@ def get_history(concerned_object: object, metrics_list: KeyList, **kwargs) -> li
     return res_list
 
 
-def get_rating_letter(rating: Union[int, float, str]) -> str:
+def get_rating_letter(rating: Union[float, str]) -> str:
     """
     :param any rating: The rating as repturned by the API (a str or float)
     :return: The rating converted from number to letter, if number between 1 and 5, else the unchanged rating

sonar/portfolios.py

@@ -31,10 +31,6 @@
 from http import HTTPStatus
 from threading import Lock
 
-if TYPE_CHECKING:
-    from sonar.util import types
-    from sonar.branches import Branch
-
 import sonar.logging as log
 import sonar.platform as pf
 from sonar.util import cache
@@ -43,15 +39,17 @@
 from sonar import aggregations, exceptions, applications, app_branches
 from sonar.projects import Project
 
-
 import sonar.permissions.permissions as perms
 import sonar.permissions.portfolio_permissions as pperms
 import sonar.sqobject as sq
 import sonar.utilities as util
 from sonar.audit import rules, problem
-
 from sonar.portfolio_reference import PortfolioReference
 
+if TYPE_CHECKING:
+    from sonar.util import types
+    from sonar.branches import Branch
+
 _CLASS_LOCK = Lock()
 
 _PORTFOLIO_QUALIFIER = "VW"

sonar/webhooks.py

@@ -42,7 +42,13 @@ class WebHook(sq.SqObject):
     """
 
     CACHE: ClassVar[cache.Cache] = cache.Cache()
-    API: ClassVar[dict[str, str]] = {c.CREATE: "webhooks/create", c.READ: "webhooks/list", c.UPDATE: "webhooks/update", c.LIST: "webhooks/list", c.DELETE: "webhooks/delete"}
+    API: ClassVar[dict[str, str]] = {
+        c.CREATE: "webhooks/create",
+        c.READ: "webhooks/list",
+        c.UPDATE: "webhooks/update",
+        c.LIST: "webhooks/list",
+        c.DELETE: "webhooks/delete",
+    }
     SEARCH_KEY_FIELD: ClassVar[str] = "key"
     SEARCH_RETURN_FIELD: ClassVar[str] = "webhooks"