Jira: add accountID for issue delete watcher method #1501

Author: gonchik

atlassian/jira.py

@@ -1525,16 +1525,20 @@ def issue_add_watcher(self, issue_key, user):
             data=data,
         )
 
-    def issue_delete_watcher(self, issue_key, user):
+    def issue_delete_watcher(self, issue_key, user=None, account_id=None):
         """
         Stop watching issue
         :param issue_key:
         :param user:
         :return:
         """
         log.info('Deleting user %s from "%s" watchers', user, issue_key)
-        params = {"username": user}
         base_url = self.resource_url("issue")
+        params = {}
+        if self.cloud:
+            params = {"accountId": account_id}
+        else:
+            params = {"username": user}
         return self.delete(
             f"{base_url}/{issue_key}/watchers",
             params=params,

examples/confluence/confluence_download_attachments_from_page_with_validation.py

@@ -1,10 +1,7 @@
 from atlassian import Confluence
 import os
 
-confluence_datacenter = Confluence(
-    url='confl_server_url',
-    token='<api_token>'
-)
+confluence_datacenter = Confluence(url="confl_server_url", token="<api_token>")
 
 
 def download_attachments_test(api_wrapper_object, page_id, directory_path):
@@ -14,8 +11,8 @@ def download_attachments_test(api_wrapper_object, page_id, directory_path):
 def check_file_size(directory):
     for filename in os.listdir(directory):
         if os.path.isfile(os.path.join(directory, filename)):
-            print(f'File: {filename}, Size: {os.path.getsize(os.path.join(directory, filename))} bytes')
+            print(f"File: {filename}, Size: {os.path.getsize(os.path.join(directory, filename))} bytes")
 
 
-download_attachments_test(confluence_datacenter, 393464, '~/Downloads/confluence_attachments')
-check_file_size('~/Downloads/confluence_attachments')
+download_attachments_test(confluence_datacenter, 393464, "~/Downloads/confluence_attachments")
+check_file_size("~/Downloads/confluence_attachments")