make compatible with python 3

Author: akreisman-epam

.coveragerc

@@ -1,4 +1,5 @@
 [run]
 source = hyperwallet
-omit = venv/*
-omit = hyperwallet/tests/*
+omit =
+        venv/*
+        hyperwallet/tests/*

CHANGELOG.rst

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+1.1.2 (current)
+------------------
+
+- Added bank card endpoint
+
 1.1.1 (2017-10-11)
 ------------------
 

hyperwallet/__init__.py

@@ -6,7 +6,7 @@
 __email__           = 'devsupport@hyperwallet.com'
 __copyright__       = 'Copyright (c) 2017 Hyperwallet'
 __license__         = 'MIT'
-__version__         = '1.1.1'
+__version__         = '1.1.2'
 __url__             = 'https://github.com/hyperwallet/python-sdk'
 __download_url__    = 'https://pypi.python.org/pypi/hyperwallet-sdk'
 __description__     = 'A Python wrapper around the Hyperwallet API'

hyperwallet/api.py

@@ -2,9 +2,9 @@
 
 import os
 
-from config import SERVER
-from exceptions import HyperwalletException
-from utils import ApiClient
+from .config import SERVER
+from .exceptions import HyperwalletException
+from .utils import ApiClient
 
 from hyperwallet import (
     User,

hyperwallet/exceptions.py

@@ -6,8 +6,16 @@ class HyperwalletException(Exception):
     An Exception raised when the SDK is used incorrectly.
     '''
 
+    @property
+    def message(self):
+        return self.__dict__.get('message', None) or getattr(self, 'args')[0]
+
 
 class HyperwalletAPIException(Exception):
     '''
     An Exception raised when the API response is an error.
     '''
+
+    @property
+    def message(self):
+        return self.__dict__.get('message', None) or getattr(self, 'args')[0]

hyperwallet/tests/test_client.py

@@ -91,9 +91,13 @@ def test_receive_valid_json_response(self, session_mock):
             content=json.dumps(data)
         )
 
+        encoded = json.dumps(data)
+        if hasattr(encoded, 'decode'):  # Python 2
+            encoded = encoded.decode('utf-8')
+
         self.assertEqual(
             self.client._makeRequest(),
-            json.loads(json.dumps(data).decode('utf-8'))
+            json.loads(encoded)
         )
 
 

hyperwallet/tests/test_models.py

@@ -2,9 +2,6 @@
 
 import json
 import unittest
-import hyperwallet
-
-from hyperwallet.exceptions import HyperwalletException
 
 from hyperwallet import (
     HyperwalletModel,
@@ -374,7 +371,7 @@ def test_transfer_method_configuration_model(self):
             transfer_method_configuration_data
         )
 
-        print transfer_method_configuration_data.get('countries')
+        print(transfer_method_configuration_data.get('countries'))
         self.assertEqual(
             test_transfer_method_configuration.__repr__(),
             'TransferMethodConfiguration({country}, {type})'.format(

hyperwallet/utils/apiclient.py

@@ -1,14 +1,16 @@
 #!/usr/bin/env python
 
-import sys
 import ssl
 import json
-import urlparse
 import requests
 
 from hyperwallet.exceptions import HyperwalletAPIException
 from requests_toolbelt.adapters.ssl import SSLAdapter
 from hyperwallet import __version__
+try:
+    from urllib.parse import urljoin
+except ImportError:
+    from urlparse import urljoin  # Python 2
 
 
 class ApiClient(object):
@@ -42,7 +44,7 @@ def __init__(self, username, password, server):
         self.server = server
 
         # The complete base URL of the API.
-        self.baseUrl = urlparse.urljoin(self.server, '/rest/v3/')
+        self.baseUrl = urljoin(self.server, '/rest/v3/')
 
         # The default connection to persist authentication and SSL settings.
         defaultSession = requests.Session()
@@ -81,7 +83,7 @@ def _makeRequest(self,
         try:
             response = self.session.request(
                 method=method,
-                url=urlparse.urljoin(self.baseUrl, url),
+                url=urljoin(self.baseUrl, url),
                 data=data,
                 headers=headers,
                 params=params
@@ -93,15 +95,17 @@ def _makeRequest(self,
                     'code': 'COMMUNICATION_ERROR',
                     'message': 'Connection to {} failed: {}'.format(
                         self.server,
-                        e.message
+                        e.args[0]
                     )
                 }]
             })
 
         if response.status_code is 204:
             return {}
 
-        content = response.content.decode('utf-8')
+        content = response.content
+        if hasattr(content, 'decode'):  # Python 2
+            content = content.decode('utf-8')
 
         try:
             json_body = json.loads(content)
@@ -110,7 +114,7 @@ def _makeRequest(self,
             raise HyperwalletAPIException({
                 'errors': [{
                     'code': 'GARBAGE_RESPONSE',
-                    'message': 'Invalid response: {}'.format(e.message)
+                    'message': 'Invalid response: {}'.format(e.args[0])
                 }]
             })