removed unused code comment, fixed httpclient init for multiple calls, added skincode from class instance if empty

Author: icipiracy

Adyen/client.py

@@ -20,6 +20,8 @@
 logger = logging.getLogger(logname())
 
 
+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 = "v18"
@@ -46,16 +48,6 @@ def __init__(self,message=None,status_code=200,psp="",raw_request="",raw_respons
         self.raw_request = raw_request
         self.raw_response = raw_response
         self.details = {}
-    """
-    def __setattr__(self, attr, value):
-        super(AdyenResult, self).__setattr__(attr, value)
-
-    def __getattr__(self, attr):
-        if attr in self.message:
-            return self.message[attr]
-        else:
-            raise AttributeError
-    """
 
 
     def __str__(self):
@@ -296,7 +288,7 @@ def call_api(self, request_data, service, action, idempotency=False,
 
         return adyen_result
 
-    def call_hpp(self, request_data, action, hmac_key="", **kwargs):
+    def call_hpp(self, message, action, hmac_key="", **kwargs):
         """This will call the adyen hpp. hmac_key and platform are pulled from
         root module level and or self object. AdyenResult will be returned on 200 response.
         Otherwise, an exception is raised.
@@ -316,6 +308,10 @@ def call_hpp(self, request_data, action, hmac_key="", **kwargs):
         """
         from Adyen import hmac, platform
 
+        if self.http_init == False:
+            self.http_client = HTTPClient(self.app_name,self.LIB_VERSION,self.USER_AGENT_SUFFIX)
+            self.http_init = True
+
         #hmac provided in function has highest priority. fallback to self then
         #root module and ensure that it is set.
         if hmac_key:
@@ -344,7 +340,8 @@ def call_hpp(self, request_data, action, hmac_key="", **kwargs):
             # logger.error(errorstring)
             raise TypeError(errorstring)
 
-        message = request_data
+        if 'skinCode' not in message:
+            message['skinCode'] = self.skin_code
 
         if 'merchantAccount' not in message:
             message['merchantAccount'] = self.merchant_account
@@ -367,6 +364,10 @@ def hpp_payment(self,request_data, action, hmac_key="", **kwargs):
 
         from Adyen import hmac, platform
 
+        if self.http_init == False:
+            self.http_client = HTTPClient(self.app_name,self.LIB_VERSION,self.USER_AGENT_SUFFIX)
+            self.http_init = True
+
         if self.platform:
             platform = self.platform
         if platform.lower() not in ['live','test']:
@@ -378,6 +379,9 @@ def hpp_payment(self,request_data, action, hmac_key="", **kwargs):
             # logger.error(errorstring)
             raise TypeError(errorstring)
 
+        if 'skinCode' not in request_data:
+            request_data['skinCode'] = self.skin_code
+
         hmac = self.hmac
 
         if 'merchantAccount' not in request_data:
@@ -529,7 +533,6 @@ def _handle_http_error(self, url, response_obj, status_code, psp_ref,
                 raise AdyenAPIInvalidAmount(
                     "Invalid amount specified"
                     "Amount may be improperly formatted, too small or too big."
-                    "Print your input amount to console or log to verify"
                     "If the issue persists, contact support@adyen.com"
                     )