[RestClient] Cleanup base class and fix init order in derived class (#584)

* [RestClient] Cleanup base class and fix init order in derived class

* Add review remark -> add *args.

Author: Spacetown

atlassian/bitbucket.py

@@ -10,11 +10,11 @@
 class Bitbucket(AtlassianRestAPI):
     bulk_headers = {"Content-Type": "application/vnd.atl.bitbucket.bulk+json"}
 
-    def __init__(self, *args, **kwargs):
-        super(Bitbucket, self).__init__(*args, **kwargs)
-        url = kwargs.pop('url', False)
-        if url and 'bitbucket.org' in url:
-            self.cloud = True
+    def __init__(self, url, *args, **kwargs):
+        if (not 'cloud' in kwargs
+            and ('bitbucket.org' in url) ):
+            kwargs['cloud'] = True
+        super(Bitbucket, self).__init__(url, *args, **kwargs)
 
     def project_list(self, limit=None):
         """

atlassian/confluence.py

@@ -30,6 +30,15 @@ class Confluence(AtlassianRestAPI):
         ".svg": "image/svg+xml"
     }
 
+    def __init__(self, url, *args, **kwargs):
+        if (('atlassian.net' in url or 'jira.com' in url)
+            and ('/wiki' not in url) ):
+            url = AtlassianRestAPI.url_joiner(url, '/wiki')
+            if not 'cloud' in kwargs:
+                kwargs['cloud'] = True
+        super(Confluence, self).__init__(url, *args, **kwargs)
+
+
     @staticmethod
     def _create_body(body, representation):
         if representation not in ['editor', 'export_view', 'view', 'storage', 'wiki']:

atlassian/rest_client.py

@@ -26,10 +26,6 @@ class AtlassianRestAPI(object):
     def __init__(self, url, username=None, password=None, timeout=60, api_root='rest/api', api_version='latest',
                  verify_ssl=True, session=None, oauth=None, cookies=None, advanced_mode=None, kerberos=None,
                  cloud=False, proxies=None):
-        if ('atlassian.net' in url or 'jira.com' in url) \
-                and '/wiki' not in url \
-                and self.__class__.__name__ in 'Confluence':
-            url = self.url_joiner(url, '/wiki')
         self.url = url
         self.username = username
         self.password = password