Merge branch 'devel' of https://github.com/bitbar/testdroid-api-client-python into devel

Author: Sakari Rautiainen

CHANGELOG

@@ -1,3 +1,6 @@
+2.6.2
+ * Fixes: Init overloading fixed, api key usage for delete and posts
+ * Features: Get project config.
 2.6.1
  * Added ability to set project framework
 2.6.0

setup.py

@@ -3,7 +3,7 @@
 import sys, os
 
 
-version = '2.6.1'
+version = '2.6.2'
 
 setup(name='testdroid',
       version=version,

testdroid/__init__.py

@@ -5,7 +5,7 @@
 from optparse import OptionParser
 from datetime import datetime
 
-__version__ = '2.6.1'
+__version__ = '2.6.2'
 
 FORMAT = "%(message)s"
 logging.basicConfig(format=FORMAT)
@@ -100,25 +100,14 @@ class Testdroid:
     # polling interval when awaiting for test run completion
     polling_interval_mins = 10
 
-    """ Simple constructor, defaults against cloud.testdroid.com
+    """ Constructor, defaults against cloud.testdroid.com
     """
-    def __init__(self):
-        self.cloud_url="https://cloud.testdroid.com"
-
-    """ Full constructor with username and password
-    """
-    def __init__(self, username=None, password=None, url="https://cloud.testdroid.com", download_buffer_size=65536):
-        self.username = username
-        self.password = password
-        self.cloud_url = url
-        self.download_buffer_size = download_buffer_size
-
-    """ Full constructor with api key
-    """
-    def __init__(self, apikey=None, url="https://cloud.testdroid.com", download_buffer_size=65536):
-        self.api_key = apikey
-        self.cloud_url = url
-        self.download_buffer_size = download_buffer_size
+    def __init__(self, **kwargs):
+        self.api_key = kwargs.get('apikey')
+        self.username = kwargs.get('username')
+        self.password = kwargs.get('password')
+        self.cloud_url = kwargs.get('url') or "https://cloud.testdroid.com"
+        self.download_buffer_size = kwargs.get('download_buffer_size') or 65536
 
     def set_apikey(self, apikey):
         self.api_key = apikey
@@ -263,7 +252,7 @@ def get(self, path=None, payload={}, headers={}):
     """
     def post(self, path=None, payload=None, headers={}):
         headers = dict(self._build_headers().items() + headers.items())
-        url = "%s/api/v2/%s?access_token=%s" % (self.cloud_url, path, self.get_token())
+        url = "%s/api/v2/%s" % (self.cloud_url, path)
         res = requests.post(url, payload, headers=headers)
         if res.status_code not in range(200, 300):
             raise RequestResponseError(res.text, res.status_code)
@@ -273,7 +262,7 @@ def post(self, path=None, payload=None, headers={}):
     """
     def delete(self, path=None, payload=None, headers={}):
         headers = dict(self._build_headers().items() + headers.items())
-        url = "%s/api/v2/%s?access_token=%s" % (self.cloud_url, path, self.get_token())
+        url = "%s/api/v2/%s" % (self.cloud_url, path)
         res = requests.delete(url, headers=headers)
         if res.status_code not in range(200, 300):
             raise RequestResponseError(res.text, res.status_code)
@@ -409,6 +398,11 @@ def set_project_parameters(self, project_id, parameters):
         path = "/users/%s/projects/%s/config/parameters" % ( me['id'], project_id )
         return self.post(path=path, payload=parameters)
 
+    """ Get project config
+    """
+    def get_project_config(self, project_id):
+        path = "/me/projects/%s/config" % ( project_id )
+        return self.get(path=path)
 
     """ Set project config according to http://docs.testdroid.com/_pages/client.html#project-config
     """