Jira: Add fields fix request 1484

Author: gonchik

atlassian/confluence.py

@@ -390,7 +390,8 @@ def get_tables_from_page(self, page_id):
         """
         Fetches html  tables added to  confluence page
         :param page_id: integer confluence page_id
-        :return: json object with page_id, number_of_tables_in_page  and  list of list tables_content representing scrapepd tables
+        :return: json object with page_id, number_of_tables_in_page
+                 and list of list tables_content representing scraped tables
         """
         try:
             page_content = self.get_page_by_id(page_id, expand="body.storage")["body"]["storage"]["value"]
@@ -736,7 +737,8 @@ def get_all_pages_by_space_ids_confluence_cloud(
         :param batch_size: OPTIONAL: The batch size of pages to retrieve from confluence per request MAX is 250.
                                      Default: 250
         :param sort: OPTIONAL: The order the pages are retrieved in.
-                               Valid values: id, -id, created-date, -created-date, modified-date, -modified-date, title, -title
+                               Valid values:
+                                    id, -id, created-date, -created-date, modified-date, -modified-date, title, -title
         :param status: OPTIONAL: Filter pages based on their status.
                                  Valid values: current, archived, deleted, trashed
                                  Default: current,archived
@@ -2735,15 +2737,17 @@ def get_space_export(self, space_key: str, export_type: str) -> str:
         """
         Export a Confluence space to a file of the specified type.
         (!) This method was developed for Confluence Cloud and may not work with Confluence on-prem.
-        (!) This is an experimental method that does not trigger an officially supported REST endpoint. It may break if Atlassian changes the space export front-end logic.
+        (!) This is an experimental method that does not trigger an officially supported REST endpoint.
+        It may break if Atlassian changes the space export front-end logic.
 
         :param space_key: The key of the space to export.
         :param export_type: The type of export to perform. Valid values are: 'html', 'csv', 'xml', 'pdf'.
         :return: The URL to download the exported file.
         """
 
         def get_atl_request(url: str):
-            #  Nested function  used to get atl_token used for XSRF protection. this is only applicable to html/csv/xml space exports
+            # Nested function  used to get atl_token used for XSRF protection.
+            # This is only applicable to html/csv/xml space exports
             try:
                 response = self.get(url, advanced_mode=True)
                 parsed_html = BeautifulSoup(response.text, "html.parser")

atlassian/jira.py

@@ -656,12 +656,16 @@ def get_custom_field_option(self, option_id):
     def get_custom_fields(self, search=None, start=1, limit=50):
         """
         Get custom fields. Evaluated on 7.12
+        Get fields paginated in cloud
         :param search: str
         :param start: long Default: 1
         :param limit: int Default: 50
         :return:
         """
-        url = self.resource_url("customFields")
+        if self.cloud:
+            url = self.resource_url("field/search")
+        else:
+            url = self.resource_url("customFields")
         params = {}
         if search:
             params["search"] = search

atlassian/rest_client.py

@@ -113,7 +113,8 @@ def __init__(
                 Defaults to 1.0.
         :param retry_with_header: Enable retry logic based on the `Retry-After` header.
                 If set to True, the request will automatically retry if the response
-                contains a `Retry-After` header with a delay and has a status code of 429. The retry delay will be extracted
+                contains a `Retry-After` header with a delay and has a status code of 429.
+                The retry delay will be extracted
                 from the `Retry-After` header and the request will be paused for the specified
                 duration before retrying. Defaults to True.
                 If the `Retry-After` header is not present, retries will not occur.
@@ -253,7 +254,7 @@ def _calculate_backoff_value(self, retry_count):
         """
         backoff_value = self.backoff_factor * (2 ** (retry_count - 1))
         if self.backoff_jitter != 0.0:
-            backoff_value += random.random() * self.backoff_jitter
+            backoff_value += random.uniform(0, self.backoff_jitter) # nosec B311
         return float(max(0, min(self.max_backoff_seconds, backoff_value)))
 
     def _retry_handler(self):

examples/jira/jira_download_attachments.py

@@ -7,11 +7,6 @@
 JIRA_LOGIN = "admin"
 JIRA_TOKEN = "dsadd2c3s"
 
-
-def get_tickets(jql):
-    pass
-
-
 if __name__ == "__main__":
     jira = Jira(url=JIRA_URL, username=JIRA_LOGIN, token=JIRA_TOKEN)
     jql = "project = DOC"

examples/jira/jira_jql_fetcher_as_weekly_report.py

@@ -31,7 +31,6 @@ def __fetch_user_activity(self, user):
         jql = "((assignee was in ({})) OR assignee in ({})) AND updated > -{}d ".format(user, user, self.days)
         print("Start fetching info jql = {}".format(jql))
         while flag:
-            values = []
             try:
                 response = self.jira.jql(
                     jql,

examples/jira/jira_notification_schemes_duplicates.py

@@ -26,9 +26,7 @@ def compare_dicts(dict1, dict2, print_diffs=False):
 
 
 def review():
-    notification_scheme_dict = {}
     all_notification_schemes_dict = {}
-
     notification_schemes_ids = jira.get_notification_schemes()
     names = []