refactor: remove six dependency and update code for Python 3 compatibility

Author: wozozo

README.md

@@ -19,11 +19,10 @@ source code") for `payjp-python`, and then run:
 
 Please see our official [documentation](https://pay.jp/docs/api).
 
-## Dependencies 
+## Dependencies
 
 - requests
-- six
 
 Install dependencies from using [pip](http://www.pip-installer.org/en/latest/):
-    
+
     pip install -r requirements.txt

payjp/api_requestor.py

@@ -8,9 +8,7 @@
 import platform
 import time
 import random
-
-from six import PY3
-from six.moves.urllib.parse import urlencode, urlsplit, urlunsplit
+from urllib.parse import urlencode, urlsplit, urlunsplit
 
 import payjp
 from . import (
@@ -128,12 +126,9 @@ def request_raw(self, method, url, params=None, supplied_headers=None):
                 val = '!! %s' % (e,)
             ua[attr] = val
 
-        if PY3:
-            encoded_api_key = str(
-                base64.b64encode(
-                    bytes(''.join([my_api_key, ':']), 'utf-8')), 'utf-8')
-        else:
-            encoded_api_key = base64.b64encode(''.join([my_api_key, ':']))
+        encoded_api_key = str(
+            base64.b64encode(
+                bytes(''.join([my_api_key, ':']), 'utf-8')), 'utf-8')
 
         headers = {
             'X-Payjp-Client-User-Agent': json.dumps(ua),
@@ -215,4 +210,3 @@ def _build_api_url(url, query):
         query = '%s&%s' % (base_query, query)
 
     return urlunsplit((scheme, netloc, path, query, fragment))
-

payjp/error.py

@@ -16,7 +16,7 @@ def __init__(self, message=None, http_body=None, http_status=None,
         self.http_body = http_body
 
         self.http_status = http_status
-        self.json_body = json_body 
+        self.json_body = json_body
 
 
 class APIError(PayjpException):
@@ -33,7 +33,7 @@ def __init__(self, message, param, code, http_body=None,
         super(CardError, self).__init__(message,
                                         http_body, http_status, json_body)
         self.param = param
-        self.code = code 
+        self.code = code
 
 
 class AuthenticationError(PayjpException):

payjp/resource.py

@@ -3,9 +3,7 @@
 import json
 import logging
 import sys
-
-from six import string_types
-from six.moves.urllib.parse import quote_plus
+from urllib.parse import quote_plus
 
 from payjp import api_requestor, error, util
 
@@ -34,7 +32,7 @@ def convert_to_payjp_object(resp, api_key, account, api_base=None):
     elif isinstance(resp, dict) and not isinstance(resp, PayjpObject):
         resp = resp.copy()
         klass_name = resp.get('object')
-        if isinstance(klass_name, string_types):
+        if isinstance(klass_name, str):
             klass = types.get(klass_name, PayjpObject)
         else:
             klass = PayjpObject
@@ -206,10 +204,10 @@ def request(self, method, url, params=None, headers=None):
     def __repr__(self):
         ident_parts = [type(self).__name__]
 
-        if isinstance(self.get('object'), string_types):
+        if isinstance(self.get('object'), str):
             ident_parts.append(self.get('object'))
 
-        if isinstance(self.get('id'), string_types):
+        if isinstance(self.get('id'), str):
             ident_parts.append('id=%s' % (self.get('id'),))
 
         unicode_repr = '<%s at %s> JSON: %s' % (

payjp/test/helper.py

@@ -8,8 +8,6 @@
 
 from mock import patch, Mock
 
-from six import string_types
-
 import payjp
 
 NOW = datetime.datetime.now()
@@ -72,7 +70,7 @@ def assertRaisesRegexp(self, exception, regexp, callable, *args, **kwargs):
             if regexp is None:
                 return True
 
-            if isinstance(regexp, string_types):
+            if isinstance(regexp, str):
                 regexp = re.compile(regexp)
             if not regexp.search(str(err)):
                 raise self.failureException('"%s" does not match "%s"' %

payjp/test/test_integration.py

@@ -3,8 +3,6 @@
 import unittest
 import payjp
 
-from six import string_types
-
 from payjp.test.helper import (PayjpTestCase, NOW, DUMMY_CARD)
 
 
@@ -17,7 +15,7 @@ def test_invalid_credentials(self):
             payjp.Customer.create()
         except payjp.error.AuthenticationError as e:
             self.assertEqual(401, e.http_status)
-            self.assertTrue(isinstance(e.http_body, string_types))
+            self.assertTrue(isinstance(e.http_body, str))
             self.assertTrue(isinstance(e.json_body, dict))
         finally:
             payjp.api_key = key
@@ -33,7 +31,7 @@ def test_invalid_card_props(self):
             payjp.Charge.create(amount=100, currency='jpy', card=EXPIRED_CARD)
         except payjp.error.InvalidRequestError as e:
             self.assertEqual(400, e.http_status)
-            self.assertTrue(isinstance(e.http_body, string_types))
+            self.assertTrue(isinstance(e.http_body, str))
             self.assertTrue(isinstance(e.json_body, dict))
 
 
@@ -44,15 +42,15 @@ def test_nonexistent_object(self):
             payjp.Charge.retrieve('invalid')
         except payjp.error.InvalidRequestError as e:
             self.assertEqual(404, e.http_status)
-            self.assertTrue(isinstance(e.http_body, string_types))
+            self.assertTrue(isinstance(e.http_body, str))
             self.assertTrue(isinstance(e.json_body, dict))
 
     def test_invalid_data(self):
         try:
             payjp.Charge.create()
         except payjp.error.InvalidRequestError as e:
             self.assertEqual(400, e.http_status)
-            self.assertTrue(isinstance(e.http_body, string_types))
+            self.assertTrue(isinstance(e.http_body, str))
             self.assertTrue(isinstance(e.json_body, dict))
 
 

payjp/test/test_requestor.py

@@ -3,10 +3,9 @@
 import base64
 import datetime
 import unittest
+from urllib.parse import parse_qsl, urlsplit
 
 from mock import Mock, MagicMock, patch
-from six.moves.urllib.parse import parse_qsl, urlsplit
-from six import PY3
 
 import payjp
 
@@ -45,12 +44,9 @@ def __eq__(self, other):
                 self._extra_match(other))
 
     def _encode(self, api_key):
-        if PY3:
-            return str(
-                base64.b64encode(
-                    bytes(''.join([api_key, ':']), 'utf-8')), 'utf-8')
-        else:
-            return base64.b64encode(''.join([api_key, ':']))
+        return str(
+            base64.b64encode(
+                bytes(''.join([api_key, ':']), 'utf-8')), 'utf-8')
 
     def _keys_match(self, other):
         expected_keys = self.EXP_KEYS + list(self.extra.keys())
@@ -413,7 +409,7 @@ def test_retry_disabled(self):
         with self.request_raw_patch:
             with self.assertRaises(payjp.error.APIError) as error:
                 self.requestor.request('get', '/test', {})
-            
+
             self.assertEqual(error.exception.http_status, 499)
 
     def test_no_retry(self):
@@ -423,7 +419,7 @@ def test_no_retry(self):
         with self.request_raw_patch:
             with self.assertRaises(payjp.error.APIError) as error:
                 self.requestor.request('get', '/test', {})
-            
+
             self.assertEqual(error.exception.http_status, 599)
 
     def test_full_retry(self):
@@ -434,7 +430,7 @@ def test_full_retry(self):
         with self.request_raw_patch:
             with self.assertRaises(payjp.error.APIError) as error:
                 self.requestor.request('get', '/test', {})
-            
+
             self.assertEqual(error.exception.http_status, 429)
 
     def test_success_at_halfway_of_retries(self):
@@ -464,7 +460,7 @@ def test_retry_initial_delay(self):
         self.assertTrue(16 <= self.requestor._get_retry_delay(10) <= 32)
 
 
-    
+
 
 if __name__ == '__main__':
     unittest.main()

requirements.txt

@@ -1,2 +1 @@
 requests
-six

setup.py

@@ -6,11 +6,10 @@
 
 install_requires = []
 
-if sys.version_info < (2, 7):
-    raise DeprecationWarning('Python 2.6 and older are no longer supported by PAY.JP. ')
+if sys.version_info < (3, 0):
+    raise DeprecationWarning('Python 2 is no longer supported by PAY.JP. Please use Python 3.')
 
 install_requires.append('requests >= 2.7.0')
-install_requires.append('six >= 1.9.0')
 
 setup(
     name="payjp",
@@ -21,4 +20,5 @@
     packages=['payjp', 'payjp.test'],
     url='https://github.com/payjp/payjp-python',
     install_requires=install_requires,
+    python_requires='>=3.0',
 )