Merge pull request #95 from Adyen/develop

Merge to master

Author: AlexandrosMor

.github/CODEOWNERS

@@ -0,0 +1 @@
+* @Aleffio @AlexandrosMor @martinsrenato @KadoBOT @rikterbeek

.gitignore

@@ -4,4 +4,5 @@
 *.pypirc
 releaseguide.md
 venv/
-.idea/
+.idea/
+.coverage

.travis.yml

@@ -4,10 +4,12 @@ python:
   - "2.7"
   - "3.6"
 cache: pip
+before_install:
+  - sudo apt-get install libgnutls28-dev
 install:
-  - pip install requests pycurl mock coveralls pylint pycodestyle
+  - make install
 script:
-  - coverage run -m unittest discover -s test -p '*Test.py'
+  - make coverage
   - pycodestyle -v
 after_success:
   - coveralls

Adyen/client.py

@@ -303,10 +303,17 @@ def call_api(self, request_data, service, action, idempotency=False,
 
         url = self._determine_api_url(platform, service, action)
 
-        raw_response, raw_request, status_code, headers = \
-            self.http_client.request(url, json=message, username=username,
-                                     password=password, headers=headers,
-                                     **kwargs)
+        if xapikey:
+            raw_response, raw_request, status_code, headers = \
+                self.http_client.request(url, json=request_data,
+                                         xapikey=xapikey, headers=headers,
+                                         **kwargs)
+        else:
+            raw_response, raw_request, status_code, headers = \
+                self.http_client.request(url, json=message, username=username,
+                                         password=password,
+                                         headers=headers,
+                                         **kwargs)
 
         # Creates AdyenResponse if request was successful, raises error if not.
         adyen_result = self._handle_response(url, raw_response, raw_request,

Adyen/httpclient.py

@@ -61,7 +61,7 @@ def _pycurl_post(self,
                      username="",
                      password="",
                      xapikey="",
-                     headers={},
+                     headers=None,
                      timeout=30):
         """This function will POST to the url endpoint using pycurl. returning
         an AdyenResult object on 200 HTTP responce. Either json or data has to
@@ -89,6 +89,8 @@ def _pycurl_post(self,
             int:    HTTP status code, eg 200,404,401
             dict:   Key/Value pairs of the headers received.
         """
+        if headers is None:
+            headers = {}
 
         response_headers = {}
 
@@ -148,7 +150,7 @@ def _requests_post(self, url,
                        username="",
                        password="",
                        xapikey="",
-                       headers={},
+                       headers=None,
                        timeout=30):
         """This function will POST to the url endpoint using requests.
         Returning an AdyenResult object on 200 HTTP response.
@@ -176,6 +178,8 @@ def _requests_post(self, url,
             int:    HTTP status code, eg 200,404,401
             dict:   Key/Value pairs of the headers received.
         """
+        if headers is None:
+            headers = {}
 
         # Adding basic auth if username and password provided.
         auth = None
@@ -204,7 +208,7 @@ def _urllib_post(self, url,
                      username="",
                      password="",
                      xapikey="",
-                     headers={},
+                     headers=None,
                      timeout=30):
 
         """This function will POST to the url endpoint using urllib2. returning
@@ -234,6 +238,9 @@ def _urllib_post(self, url,
             dict:   Key/Value pairs of the headers received.
         """
 
+        if headers is None:
+            headers = {}
+
         # Store regular dict to return later:
         raw_store = json