deleted unused, rephrased somethin (#50)

* deleted unused, rephrased somethin

* style

* regex must be raw string

* Turned back to BytesIO

Author: thaelathy

Adyen/client.py

@@ -14,7 +14,8 @@
     AdyenAPIValidationError,
     AdyenInvalidRequestError,
     AdyenAPIInvalidFormat,
-    AdyenAPIInvalidAmount)
+    AdyenAPIInvalidAmount,
+)
 from . import settings
 
 
@@ -68,7 +69,7 @@ class AdyenClient(object):
     def __init__(self, username=None, password=None,
                  review_payout_username=None, review_payout_password=None,
                  store_payout_username=None, store_payout_password=None,
-                 platform=None, merchant_account=None,
+                 platform="test", merchant_account=None,
                  merchant_specific_url=None, skin_code=None,
                  hmac=None, app_name=None,
                  http_force=None):
@@ -79,8 +80,6 @@ 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
@@ -124,55 +123,43 @@ def _determine_hpp_url(self, platform, action):
 
     def _review_payout_username(self, **kwargs):
         if 'username' in kwargs:
-            review_payout_username = kwargs['username']
+            return kwargs['username']
         elif self.review_payout_username:
-            review_payout_username = self.review_payout_username
-        else:
-            errorstring = """AdyenInvalidRequestError: Please set your review payout
-            webservice username. You can do this by running
-            'Adyen.review_payout_username = 'Your payout username' """
-            raise AdyenInvalidRequestError(errorstring)
-
-        return review_payout_username
+            return self.review_payout_username
+        errorstring = """Please set your review payout
+        webservice username. You can do this by running
+        'Adyen.review_payout_username = 'Your payout username' """
+        raise AdyenInvalidRequestError(errorstring)
 
     def _review_payout_pass(self, **kwargs):
         if 'password' in kwargs:
-            review_payout_password = kwargs["password"]
+            return kwargs["password"]
         elif self.review_payout_password:
-            review_payout_password = self.review_payout_password
-        else:
-            errorstring = """AdyenInvalidRequestError: Please set your review payout
-            webservice password. You can do this by running
-            'Adyen.review_payout_password = 'Your payout password'"""
-            raise AdyenInvalidRequestError(errorstring)
-
-        return review_payout_password
+            return self.review_payout_password
+        errorstring = """Please set your review payout
+        webservice password. You can do this by running
+        'Adyen.review_payout_password = 'Your payout password'"""
+        raise AdyenInvalidRequestError(errorstring)
 
     def _store_payout_username(self, **kwargs):
         if 'username' in kwargs:
-            store_payout_username = kwargs['username']
+            return kwargs['username']
         elif self.store_payout_username:
-            store_payout_username = self.store_payout_username
-        else:
-            errorstring = """AdyenInvalidRequestError: Please set your store payout
-            webservice username. You can do this by running
-            'Adyen.store_payout_username = 'Your payout username'"""
-            raise AdyenInvalidRequestError(errorstring)
-
-        return store_payout_username
+            return self.store_payout_username
+        errorstring = """Please set your store payout
+        webservice username. You can do this by running
+        'Adyen.store_payout_username = 'Your payout username'"""
+        raise AdyenInvalidRequestError(errorstring)
 
     def _store_payout_pass(self, **kwargs):
         if 'password' in kwargs:
-            store_payout_password = kwargs["password"]
+            return kwargs["password"]
         elif self.store_payout_password:
-            store_payout_password = self.store_payout_password
-        else:
-            errorstring = """AdyenInvalidRequestError: Please set your store payout
-            webservice password. You can do this by running
-            'Adyen.store_payout_password = 'Your payout password'"""
-            raise AdyenInvalidRequestError(errorstring)
-
-        return store_payout_password
+            return self.store_payout_password
+        errorstring = """Please set your store payout
+        webservice password. You can do this by running
+        'Adyen.store_payout_password = 'Your payout password'"""
+        raise AdyenInvalidRequestError(errorstring)
 
     def call_api(self, request_data, service, action, idempotency=False,
                  **kwargs):
@@ -203,62 +190,53 @@ def call_api(self, request_data, service, action, idempotency=False,
 
         # username at self object has highest priority. fallback to root module
         # and ensure that it is set.
-        if 'username' in kwargs:
-            username = kwargs["username"]
+        if self.username:
+            username = self.username
+        elif 'username' in kwargs:
+            username = kwargs.pop("username")
         elif service == "Payout":
             if any(substring in action for substring in ["store", "submit"]):
                 username = self._store_payout_username(**kwargs)
             else:
                 username = self._review_payout_username(**kwargs)
-        elif self.username:
-            username = self.username
         if not username:
-            errorstring = """AdyenInvalidRequestError: Please set your webservice username."
+            errorstring = """Please set your webservice username.
              You can do this by running 'Adyen.username = 'Your username'"""
             raise AdyenInvalidRequestError(errorstring)
-        # Ensure that username has been removed so as not to be passed to adyen
-        if 'username' in kwargs:
-            del kwargs['username']
 
         # password at self object has highest priority. fallback to root module
         # and ensure that it is set.
-        if 'password' in kwargs:
-            password = kwargs["password"]
+        if self.password:
+            password = self.password
+        elif 'password' in kwargs:
+            password = kwargs.pop("password")
         elif service == "Payout":
             if any(substring in action for substring in ["store", "submit"]):
                 password = self._store_payout_pass(**kwargs)
             else:
                 password = self._review_payout_pass(**kwargs)
-        elif self.password:
-            password = self.password
         if not password:
-            errorstring = """AdyenInvalidRequestError: Please set your webservice password.
+            errorstring = """Please set your webservice password.
              You can do this by running 'Adyen.password = 'Your password'"""
             raise AdyenInvalidRequestError(errorstring)
-        # Ensure that password has been removed so as not to be passed to adyen
-        if 'password' in kwargs:
-            del kwargs["password"]
 
         # platform at self object has highest priority. fallback to root module
         # and ensure that it is set to either 'live' or 'test'.
-        if 'platform' in kwargs:
-            platform = kwargs['platform']
-            del kwargs['platform']
-        elif self.platform:
+        if self.platform:
             platform = self.platform
+        elif 'platform' in kwargs:
+            platform = kwargs.pop('platform')
 
-        if platform.lower() not in ['live', 'test']:
-            errorstring = "'platform' must be the value of 'live' or 'test'"
-            raise ValueError(errorstring)
-        elif not isinstance(platform, str):
+        if not isinstance(platform, str):
             errorstring = "'platform' value must be type of string"
             raise TypeError(errorstring)
+        elif platform.lower() not in ['live', 'test']:
+            errorstring = "'platform' must be the value of 'live' or 'test'"
+            raise ValueError(errorstring)
 
         message = request_data
 
-        if 'merchantAccount' not in message:
-            message['merchantAccount'] = self.merchant_account
-        if message['merchantAccount'] == "":
+        if not message.get('merchantAccount'):
             message['merchantAccount'] = self.merchant_account
 
         # Adyen requires this header to be set and uses the combination of
@@ -314,7 +292,8 @@ def call_hpp(self, message, action, hmac_key="", **kwargs):
         if self.hmac:
             hmac = self.hmac
         elif not hmac:
-            errorstring = """Please set an hmac with your Adyen.Adyen class instance.
+            errorstring = """Please set an hmac with your Adyen.Adyen
+            class instance.
             'Adyen.hmac = \"!WR#F@...\"' or as an additional
              parameter in the function call ie.
             'Adyen.hpp.directory_lookup(hmac=\"!WR#F@...\"'. Please reach
@@ -323,14 +302,13 @@ def call_hpp(self, message, action, hmac_key="", **kwargs):
 
         # platform provided in self has highest priority,
         # fallback to root module and ensure that it is set.
-        if 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)
-        elif not isinstance(platform, str):
+        platform = self.platform
+        if not isinstance(platform, str):
             errorstring = "'platform' must be type string"
             raise TypeError(errorstring)
+        elif platform.lower() not in ['live', 'test']:
+            errorstring = " 'platform' must be the value of 'live' or 'test' "
+            raise ValueError(errorstring)
 
         if 'skinCode' not in message:
             message['skinCode'] = self.skin_code
@@ -363,12 +341,12 @@ def hpp_payment(self, request_data, action, hmac_key="", **kwargs):
             self.http_init = True
 
         platform = self.platform
-        if platform.lower() not in ['live', 'test']:
-            errorstring = " 'platform' must be the value of 'live' or 'test' "
-            raise ValueError(errorstring)
-        elif not isinstance(platform, str):
+        if not isinstance(platform, str):
             errorstring = "'platform' must be type string"
             raise TypeError(errorstring)
+        elif platform.lower() not in ['live', 'test']:
+            errorstring = " 'platform' must be the value of 'live' or 'test' "
+            raise ValueError(errorstring)
 
         if 'skinCode' not in request_data:
             request_data['skinCode'] = self.skin_code
@@ -444,14 +422,11 @@ def _handle_response(self, url, raw_response, raw_request,
                 reference = message.get("reference",
                                         message.get("merchantReference"))
 
-                errorstring = """AdyenInvalidRequestError: Unable to retrieve payment "
+                errorstring = """Unable to retrieve payment "
                 list. Received the error: {}. Please verify your request "
                 and try again. If the issue persists, please reach out to "
                 support@adyen.com including the "
                 merchantReference: {}""".format(error, reference),
-                raw_request = message,
-                raw_response = raw_response,
-                url = url
 
                 raise AdyenInvalidRequestError(errorstring)
 
@@ -568,6 +543,6 @@ def _handle_http_error(self, url, response_obj, status_code, psp_ref,
 
     def _error_from_hpp(self, html):
         # Must be updated when Adyen response is changed:
-        match_obj = re.search('>Error:\s*(.*?)<br', html)
+        match_obj = re.search(r'>Error:\s*(.*?)<br', html)
         if match_obj:
             return match_obj.group(1)

Adyen/exceptions.py

@@ -19,17 +19,20 @@ def __init__(self,
         self.status_code = status_code
 
     def __str__(self):
-        return repr(self.message)
+        return repr("{}:{}".format(self.__class__.__name__, self.message))
 
     def debug(self):
-        return "message: {}\nHTTP status_code:{}\nurl: {}\nrequest:" \
-               " {}\nresponse: {}\nheaders: {}".format(
-                self.message,
-                self.status_code,
-                self.url,
-                self.raw_request,
-                self.raw_response,
-                self.headers)
+        return ("class: {}\nmessage: {}\nHTTP status_code:{}\nurl: {}"
+                "request: {}\nresponse: {}\nheaders: {}".format(
+                    self.__class__.__name__,
+                    self.message,
+                    self.status_code,
+                    self.url,
+                    self.raw_request,
+                    self.raw_response,
+                    self.headers
+                    )
+                )
 
 
 class AdyenInvalidRequestError(AdyenError):
@@ -47,9 +50,6 @@ def __init__(self,
         self.error_code = error_code
         self.result = result
 
-    def __str__(self):
-        return repr(self.message)
-
 
 class AdyenAPIAuthenticationError(AdyenAPIResponseError):
     pass

Adyen/httpclient.py

@@ -89,22 +89,13 @@ def _pycurl_post(self,
 
         response_headers = {}
 
-        def handle_header(header_line):
-            header_line = header_line.decode('iso-8859-1')
-            if ':' in header_line:
-                name, value = header_line.split(':', 1)
-                name = name.strip()
-                value = value.strip()
-                response_headers[name] = value
-
         curl = pycurl.Curl()
         curl.setopt(curl.URL, url)
-
         if sys.version_info[0] >= 3:
             stringbuffer = BytesIO()
         else:
             stringbuffer = StringIO()
-        # stringbuffer = StringIO()
+
         curl.setopt(curl.WRITEDATA, stringbuffer)
 
         # Add User-Agent header to request so that the
@@ -151,7 +142,7 @@ def _requests_post(self, url,
                        data=None,
                        username="",
                        password="",
-                       headers={},
+                       headers=None,
                        timeout=30):
         """This function will POST to the url endpoint using requests.
         Returning an AdyenResult object on 200 HTTP response.
@@ -177,13 +168,13 @@ 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 = ""
+        auth = None
         if username and password:
             auth = requests.auth.HTTPBasicAuth(username, password)
-        else:
-            auth = None
 
         # Add User-Agent header to request so that the request
         # can be identified as coming from the Adyen Python library.
@@ -204,7 +195,7 @@ def _urllib_post(self, url,
                      data="",
                      username="",
                      password="",
-                     headers={},
+                     headers=None,
                      timeout=30):
 
         """This function will POST to the url endpoint using urllib2. returning
@@ -231,6 +222,8 @@ def _urllib_post(self, url,
             int:    HTTP status code, eg 200,404,401
             dict:   Key/Value pairs of the headers received.
         """
+        if headers is None:
+            headers = {}
 
         # Store regular dict to return later:
         raw_store = json
@@ -288,7 +281,7 @@ def request(self, url,
                 data="",
                 username="",
                 password="",
-                headers={},
+                headers=None,
                 timout=30):
         """This is overridden on module initialization. This function will make
         an HTTP POST to a given url. Either json/data will be what is posted to