Merge pull request #45 from Adyen/pw-321

Improvements

Author: lancergr

Adyen/client.py

@@ -15,18 +15,7 @@
     AdyenInvalidRequestError,
     AdyenAPIInvalidFormat,
     AdyenAPIInvalidAmount)
-
-HMAC_TEST_url = "https://ca-test.adyen.com/ca/ca/skin/checkhmac.shtml"
-
-BASE_PAL_url = "https://pal-{}.adyen.com/pal/servlet"
-BASE_HPP_url = "https://{}.adyen.com/hpp"
-API_VERSION = "v30"
-API_RECURRING_VERSION = "v25"
-API_CLIENT_ATTR = ["username", "password", "review_payout_user",
-                   "review_payout_password", "confirm_payout_user",
-                   "confirm_payout_password", "platform",
-                   "merchant_account", "merchant_specific_url",
-                   "hmac"]
+from . import settings
 
 
 class AdyenResult(object):
@@ -110,11 +99,11 @@ def _determine_api_url(self, platform, service, action):
             service (str): API service to place request through.
             action (str): the API action to perform.
         """
-        base_uri = BASE_PAL_url.format(platform)
+        base_uri = settings.BASE_PAL_URL.format(platform)
         if service == "Recurring":
-            api_version = API_RECURRING_VERSION
+            api_version = settings.API_RECURRING_VERSION
         else:
-            api_version = API_VERSION
+            api_version = settings.API_VERSION
         return '/'.join([base_uri, service, api_version, action])
 
     def _determine_hpp_url(self, platform, action):
@@ -126,7 +115,7 @@ def _determine_hpp_url(self, platform, action):
             action (str):   the HPP action to perform.
             possible actions: select, pay, skipDetails, directory
         """
-        base_uri = BASE_HPP_url.format(platform)
+        base_uri = settings.BASE_HPP_URL.format(platform)
         service = action + '.shtml'
         result = '/'.join([base_uri, service])
         return result
@@ -438,8 +427,8 @@ def _handle_response(self, url, raw_response, raw_request,
                 if response['errorCode']:
                     return raw_response
             except KeyError:
-                errstr = 'KeyError: errorCode'
-            pass
+                erstr = 'KeyError: errorCode'
+                raise AdyenAPICommunicationError(erstr)
         else:
             try:
                 response = json_lib.loads(raw_response)

Adyen/settings.py

@@ -0,0 +1,6 @@
+#!/bin/python
+
+BASE_PAL_URL = "https://pal-{}.adyen.com/pal/servlet"
+BASE_HPP_URL = "https://{}.adyen.com/hpp"
+API_VERSION = "v30"
+API_RECURRING_VERSION = "v25"