Merge pull request #29 from Adyen/Tests-LibChanges

Fixes for Python3 version

Author: rikterbeek

.travis.yml

@@ -2,6 +2,7 @@ sudo: true
 language: python
 python:
   - "2.7"
+  - "3.6"
 cache: pip
 install:
   - pip install requests

Adyen/client.py

@@ -200,7 +200,7 @@ def call_api(self, request_data, service, action, idempotency=False,
         from . import username, password, merchant_account, platform
         #
         if self.http_init == False:
-            self.http_client = HTTPClient(self.app_name,self.LIB_VERSION,self.USER_AGENT_SUFFIX, self.http_force)
+            self.http_client = HTTPClient(self.app_name,self.USER_AGENT_SUFFIX,self.LIB_VERSION,self.http_force)
             self.http_init = True
 
         #username at self object has highest priority. fallback to root module
@@ -302,7 +302,7 @@ def call_hpp(self, message, action, hmac_key="", **kwargs):
         from . import hmac, platform
         #
         if self.http_init == False:
-            self.http_client = HTTPClient(self.app_name,self.LIB_VERSION,self.USER_AGENT_SUFFIX, self.http_force)
+            self.http_client = HTTPClient(self.app_name,self.USER_AGENT_SUFFIX,self.LIB_VERSION,self.http_force)
             self.http_init = True
 
         #hmac provided in function has highest priority. fallback to self then
@@ -355,7 +355,7 @@ def hpp_payment(self,request_data, action, hmac_key="", **kwargs):
         from . import hmac, platform
         #
         if self.http_init == False:
-            self.http_client = HTTPClient(self.app_name,self.LIB_VERSION,self.USER_AGENT_SUFFIX, self.http_force)
+            self.http_client = HTTPClient(self.app_name,self.USER_AGENT_SUFFIX,self.LIB_VERSION,self.http_force)
             self.http_init = True
 
         if self.platform:
@@ -409,24 +409,18 @@ def _handle_response(self, url, raw_response, raw_request, status_code, headers,
             response = {}
             # If the result can't be parsed into json, most likely is raw html.
             # Some response are neither json or raw html, handle them here:
-            try:
-                response = json_lib.loads(raw_result)
-
-                self._handle_http_error(url, response, status_code,
-                    headers.get('pspReference'), raw_request, raw_response, headers)
-            except:
 
-                response = json_lib.loads(raw_response)
+            response = json_lib.loads(raw_response)
 
-                # Pass raised error to error handler.
-                self._handle_http_error(url,response,status_code,headers.get('pspReference'),raw_request,raw_response,headers,request_dict)
+            # Pass raised error to error handler.
+            self._handle_http_error(url,response,status_code,headers.get('pspReference'),raw_request,raw_response,headers,request_dict)
 
-                try:
-                    if response['errorCode']:
-                        return raw_response
-                except KeyError:
-                    errstr = 'KeyError: errorCode'
-                pass
+            try:
+                if response['errorCode']:
+                    return raw_response
+            except KeyError:
+                errstr = 'KeyError: errorCode'
+            pass
         else:
             try:
                 response = json_lib.loads(raw_response)

Adyen/httpclient.py

@@ -1,6 +1,7 @@
 #!/bin/python
 
 from __future__ import absolute_import, division, print_function, unicode_literals
+import sys
 
 try:
     import requests
@@ -23,11 +24,11 @@
     from urllib2 import Request, urlopen, HTTPError
 
 try:
-    # Python 3
-    from io import StringIO
-except ImportError:
     # Python 2
     from StringIO import StringIO
+except ImportError:
+    # Python 3
+    from io import BytesIO
 
 import json as json_lib
 import re
@@ -40,13 +41,12 @@
 #    ['raw_response','raw_request','status_code','headers'])
 
 class HTTPClient(object):
-    def __init__(self,app_name,USER_AGENT_SUFFIX,LIB_VERSION, force_request = None):
+    def __init__(self,app_name,USER_AGENT_SUFFIX,LIB_VERSION,force_request = None):
         #Check if requests already available, default to urllib
         # self.app_name = app_name
         # self.LIB_VERSION = LIB_VERSION
         # self.USER_AGENT_SUFFIX = USER_AGENT_SUFFIX
         self.user_agent = app_name + " " + USER_AGENT_SUFFIX + LIB_VERSION
-
         if not force_request:
             if requests:
                 self.request = self._requests_post
@@ -107,15 +107,22 @@ def handle_header(header_line):
         curl = pycurl.Curl()
         curl.setopt(curl.URL, url)
 
-        stringbuffer = StringIO()
+        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 request can be identified as coming
         # from the Adyen Python library.
         headers['User-Agent'] = self.user_agent
 
         # Convert the header dict to formatted array as pycurl needs.
-        header_list = ["%s:%s" % (k,v) for k,v in headers.iteritems()]
+        if sys.version_info[0] >= 3:
+            header_list = ["%s:%s" % (k, v) for k, v in headers.items()]
+        else:
+            header_list = ["%s:%s" % (k, v) for k, v in headers.iteritems()]
         #Ensure proper content-type when adding headers
         if json:
             header_list.append("Content-Type:application/json")
@@ -236,7 +243,7 @@ def _urllib_post(self, url,
         raw_store = json
 
         raw_request = json_lib.dumps(json) if json else urlencode(data)
-        url_request = Request(url,data=raw_request)
+        url_request = Request(url,data=raw_request.encode('utf8'))
         if json:
             url_request.add_header('Content-Type','application/json')
         elif not data:
@@ -251,8 +258,12 @@ def _urllib_post(self, url,
 
         #Adding basic auth is username and password provided.
         if username and password:
-            basicAuthstring = base64.encodestring('%s:%s' % (username,
-                password)).replace('\n', '')
+            if sys.version_info[0] >= 3:
+                basicAuthstring = base64.encodebytes(('%s:%s' % (username,
+                                                                 password)).encode()).decode().replace('\n', '')
+            else:
+                basicAuthstring = base64.encodestring('%s:%s' % (username,
+                                                                 password)).replace('\n', '')
             url_request.add_header("Authorization", "Basic %s" % basicAuthstring)
 
         #Adding the headers to the request.

README.md

@@ -8,7 +8,7 @@ payments within any Python application.
 
 ## Requirements
 
-- Python 2.7
+- Python 2.7 or 3.6
 - Packages: requests or pycurl ( optional )
 - Adyen account. If you don't have this you can request it here: https://www.adyen.com/home/discover/test-account-signup#form
 

test/BaseTest.py

@@ -11,9 +11,11 @@ def create_client_from_file(self, status, request, filename = None):
         if filename:
             with open(filename) as data_file:
                 data = json.load(data_file)
-                strjson = open(filename).read()
+                st = open(filename)
+                strjson = st.read()
         else:
             data = ""
+            st = ""
             strjson = ""
 
         self.ady.client.http_client = httpclient.HTTPClient
@@ -22,4 +24,7 @@ def create_client_from_file(self, status, request, filename = None):
 
         # self.ady.client.http_client.request = mock.MagicMock(return_value=[strjson, request, status, {'User-Agent': 'appname adyen-python-api-library/1.0.0'}])
         mockclient = self.ady.client
+        if st:
+            st.close()
         return mockclient
+

test/PaymentTest.py

@@ -39,7 +39,7 @@ def test_authorise_success_mocked(self):
         fraudCheckResult = result.message['fraudResult']['results'][0]['FraudCheckResult']
         self.assertEqual("CardChunkUsage", fraudCheckResult['name'])
         self.assertEqual(8, fraudCheckResult['accountScore'])
-        self.assertEquals(2, fraudCheckResult['checkId'])
+        self.assertEqual(2, fraudCheckResult['checkId'])
 
     def test_authorise_error010_mocked(self):
         request = {}