Skip to content

Commit 1608af0

Browse files
committed
Please mypy
1 parent 2df9e0f commit 1608af0

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

jbi/jira/client.py

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import logging
2-
from typing import Collection, Iterable, Optional
2+
from typing import Any, Collection, Iterable, Optional, Union
33

44
import requests
55
from atlassian import Jira
@@ -84,7 +84,7 @@ def paginated_projects(
8484
expand=None,
8585
url=None,
8686
keys: Optional[Collection[str]] = None,
87-
):
87+
) -> dict:
8888
"""Returns a paginated list of projects visible to the user.
8989
9090
https://developer.atlassian.com/cloud/jira/platform/rest/v2/api-group-projects/#api-rest-api-2-project-search-get
@@ -97,20 +97,23 @@ def paginated_projects(
9797
"``projects_from_cloud`` method is only available for Jira Cloud platform"
9898
)
9999

100-
params = []
100+
params_dict: dict[str, Any] = {}
101101

102102
if keys is not None:
103103
if len(keys) > 50:
104104
raise ValueError("Up to 50 project keys can be provided.")
105-
params = [("keys", key) for key in keys]
105+
params_dict["keys"] = list(keys)
106106

107107
if included_archived:
108-
params.append(("includeArchived", included_archived))
108+
params_dict["includeArchived"] = included_archived
109109
if expand:
110-
params.append(("expand", expand))
110+
params_dict["expand"] = expand
111111
page_url = url or self.resource_url("project/search")
112112
is_url_absolute = bool(page_url.lower().startswith("http"))
113-
return self.get(page_url, params=params, absolute=is_url_absolute)
113+
projects: Union[dict, None] = self.get(
114+
page_url, params=params_dict, absolute=is_url_absolute
115+
)
116+
return projects if projects else {"values": []}
114117

115118
@instrumented_method
116119
def permitted_projects(self, permissions: Optional[Iterable] = None) -> list[dict]:
@@ -125,5 +128,5 @@ def permitted_projects(self, permissions: Optional[Iterable] = None) -> list[dic
125128
"/rest/api/2/permissions/project",
126129
json={"permissions": list(permissions)},
127130
)
128-
projects: list[dict] = response["projects"]
131+
projects: list[dict] = response["projects"] if response else []
129132
return projects

0 commit comments

Comments
 (0)