Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion atlassian/jira.py
Original file line number Diff line number Diff line change
Expand Up @@ -3638,7 +3638,7 @@ def approximate_issue_count(
url = self.resource_url("search/approximate-count")
return self.post(url, data)

def match_jql(self, issue_ids: List[int], jqls: List[str]) -> Optional[dict[Any, Any]]:
def match_jql(self, issue_ids: List[int], jqls: List[str]) -> Optional[Dict[Any, Any]]:
"""
Checks which issues match a list of JQL queries.

Expand Down
13 changes: 10 additions & 3 deletions atlassian/rest_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,12 @@ def __init__(
self.username = username
self.password = password
self.timeout = int(timeout)
self.verify_ssl = verify_ssl
if session:
# don't override verify if session is passed
self.verify_ssl = session.verify
else:
# otherwise use the passed value or default to True
self.verify_ssl = verify_ssl
self.api_root = api_root
self.api_version = api_version
self.cookies = cookies
Expand Down Expand Up @@ -990,8 +995,10 @@ def raise_for_status(self, response: Response) -> None:
elif isinstance(errors, dict) and "message" in errors:
error_msg_list.append(errors.get("message", ""))
elif isinstance(errors, list):
error_msg_list.extend([v.get("message", "") if isinstance(v, dict) else v for v in errors])
error_msg = "\n".join(error_msg_list)
error_msg_list.extend(
[v.get("message", "") if isinstance(v, dict) else v for v in errors]
)
error_msg = "\n".join(error_msg_list) if error_msg_list else "Unknown error"
except Exception as e:
log.error(e)
response.raise_for_status()
Expand Down
Loading