Merge pull request #46 from thaelathy/alina

Alina

Author: rikterbeek

.gitignore

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

Adyen/__init__.py

@@ -22,13 +22,6 @@
 
 from .httpclient import HTTPClient
 
-username = None
-password = None
-platform = None
-merchant_account = None
-merchant_specific_url = None
-hmac = None
-
 
 class Adyen(AdyenBase):
     def __init__(self, **kwargs):

Adyen/client.py

@@ -79,6 +79,8 @@ def __init__(self, username=None, password=None,
         self.store_payout_username = store_payout_username
         self.store_payout_password = store_payout_password
         self.platform = platform
+        if not self.platform:
+            self.platform = 'test'
         self.merchant_specific_url = merchant_specific_url
         self.hmac = hmac
         self.merchant_account = merchant_account
@@ -308,9 +310,8 @@ def call_hpp(self, message, action, hmac_key="", **kwargs):
 
         # hmac provided in function has highest priority. fallback to self then
         # root module and ensure that it is set.
-        if hmac_key:
-            hmac = hmac_key
-        elif self.hmac:
+        hmac = hmac_key
+        if self.hmac:
             hmac = self.hmac
         elif not hmac:
             errorstring = """Please set an hmac with your Adyen.Adyen class instance.
@@ -354,17 +355,14 @@ def call_hpp(self, message, action, hmac_key="", **kwargs):
 
     def hpp_payment(self, request_data, action, hmac_key="", **kwargs):
 
-        from . import platform
-
         if not self.http_init:
             self.http_client = HTTPClient(self.app_name,
                                           self.USER_AGENT_SUFFIX,
                                           self.LIB_VERSION,
                                           self.http_force)
             self.http_init = True
 
-        if self.platform:
-            platform = self.platform
+        platform = self.platform
         if platform.lower() not in ['live', 'test']:
             errorstring = " 'platform' must be the value of 'live' or 'test' "
             raise ValueError(errorstring)
@@ -477,8 +475,7 @@ def _handle_http_error(self, url, response_obj, status_code, psp_ref,
         """
 
         if status_code == 404:
-            from . import merchant_specific_url
-            if url == merchant_specific_url:
+            if url == self.merchant_specific_url:
                 erstr = "Received a 404 for url:'{}'. Please ensure that" \
                         " the custom merchant specific url is correct" \
                     .format(url)
@@ -510,7 +507,6 @@ def _handle_http_error(self, url, response_obj, status_code, psp_ref,
                     " if the problem persists"
             raise AdyenAPIAuthenticationError(erstr)
         elif status_code == 403:
-            from . import username
 
             if response_obj.get("message") == "Invalid Merchant Account":
                 erstr = ("You provided the merchant account:'%s' that"
@@ -528,7 +524,7 @@ def _handle_http_error(self, url, response_obj, status_code, psp_ref,
                     " the PSP reference: %s" % (
                         response_obj["message"], self.username, psp_ref)
 
-            raise AdyenAPIInvalidPermission(erstr, username, psp_ref,
+            raise AdyenAPIInvalidPermission(erstr, self.username, psp_ref,
                                             raw_request=raw_request,
                                             raw_response=raw_response, url=url,
                                             psp=psp_ref, headers=headers)

Adyen/services.py

@@ -1,6 +1,8 @@
 from __future__ import absolute_import, division, unicode_literals
 
 import datetime
+
+from Adyen import AdyenClient
 from . import validation
 
 
@@ -20,11 +22,11 @@ def __getattr__(self, attr):
 
 
 class AdyenServiceBase(AdyenBase):
-    def __init__(self, client=""):
+    def __init__(self, client=None):
         if client:
             self.client = client
         else:
-            self.client = AdyenAPIClient()
+            self.client = AdyenClient()
 
 
 class AdyenRecurring(AdyenServiceBase):
@@ -39,7 +41,7 @@ class AdyenRecurring(AdyenServiceBase):
             use. If not provided, a new API client will be created.
     """
 
-    def __init__(self, client=""):
+    def __init__(self, client=None):
         super(AdyenRecurring, self).__init__(client=client)
         self.service = "Recurring"
 

Adyen/util.py

@@ -8,25 +8,6 @@
 import binascii
 
 
-def _generate_signing_string(dict_object, hmac_key):
-    if not isinstance(dict_object, dict):
-        raise ValueError("Must Provide dictionary object")
-
-    def escape_val(val):
-        if isinstance(val, int):
-            return val
-        return val.replace('\\', '\\\\').replace(':', '\\:')
-
-    ordered_request = OrderedDict(sorted(dict_object.items(),
-                                         key=lambda t: t[0]))
-
-    signing_string = ':'.join(
-        map(escape_val, chain(map(str, ordered_request.keys()),
-                              map(str, ordered_request.values()))))
-
-    return signing_string
-
-
 def generate_hpp_sig(dict_object, hmac_key):
     if 'issuerId' in dict_object:
         if dict_object['issuerId'] == "":