diff --git a/atlassian/jira.py b/atlassian/jira.py index 6bff24ad8..a6abd2e98 100644 --- a/atlassian/jira.py +++ b/atlassian/jira.py @@ -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. diff --git a/atlassian/rest_client.py b/atlassian/rest_client.py index 9bce6029e..dba986cff 100644 --- a/atlassian/rest_client.py +++ b/atlassian/rest_client.py @@ -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 @@ -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()