refactor: remove util.utf8 usage and update deprecation warning for Python version support

Author: wozozo

payjp/api_requestor.py

@@ -14,7 +14,6 @@
 from . import (
     error,
     http_client,
-    util,
     version,
 )
 
@@ -185,14 +184,13 @@ def _encode_datetime(dttime):
 
 def _api_encode(data):
     for key, value in data.items():
-        key = util.utf8(key)
         if value is None:
             continue
         elif hasattr(value, 'payjp_id'):
             yield (key, value.payjp_id)
         elif isinstance(value, list) or isinstance(value, tuple):
             for subvalue in value:
-                yield ("%s[]" % (key,), util.utf8(subvalue))
+                yield ("%s[]" % (key,), subvalue)
         elif isinstance(value, dict):
             subdict = dict(('%s[%s]' % (key, subkey), subvalue) for
                            subkey, subvalue in value.items())
@@ -201,7 +199,7 @@ def _api_encode(data):
         elif isinstance(value, datetime.datetime):
             yield (key, _encode_datetime(value))
         else:
-            yield (key, util.utf8(value))
+            yield (key, value)
 
 def _build_api_url(url, query):
     scheme, netloc, path, base_query, fragment = urlsplit(url)

payjp/resource.py

@@ -5,7 +5,7 @@
 import sys
 from urllib.parse import quote_plus
 
-from payjp import api_requestor, error, util
+from payjp import api_requestor, error
 
 logger = logging.getLogger('payjp')
 
@@ -239,7 +239,6 @@ def create(self, **params):
 
     def retrieve(self, id, **params):
         base = self.get('url')
-        id = util.utf8(id)
         extn = quote_plus(id)
         url = "%s/%s" % (base, extn)
 
@@ -380,7 +379,6 @@ def instance_url(self):
         id = self.get('id')
         if not id:
             return "/v1/accounts"
-        id = util.utf8(id)
         base = self.class_url()
         extn = quote_plus(id)
         return "%s/%s" % (base, extn)
@@ -389,11 +387,8 @@ def instance_url(self):
 class Card(UpdateableAPIResource, DeletableAPIResource):
 
     def instance_url(self):
-        self.id = util.utf8(self.id)
         extn = quote_plus(self.id)
         if (hasattr(self, 'customer')):
-            self.customer = util.utf8(self.customer)
-
             base = Customer.class_url()
             owner_extn = quote_plus(self.customer)
 

payjp/test/test_requestor.py

@@ -133,7 +133,7 @@ class APIRequestorRequestTests(PayjpUnitTestCase):
             ('%s[]', 'baz'),
         ],
         'string': [('%s', 'boo')],
-        'unicode': [('%s', payjp.util.utf8(u'\u1234'))],
+        'unicode': [('%s', u'\u1234')],
         'datetime': [('%s', 1356994801)],
         'none': [],
     }

payjp/util.py

@@ -1,13 +1,11 @@
-# coding: utf-8
-
 import sys
 
 from setuptools import setup
 
 install_requires = []
 
-if sys.version_info < (3, 0):
-    raise DeprecationWarning('Python 2 is no longer supported by PAY.JP. Please use Python 3.')
+if sys.version_info < (3, 8):
+    raise DeprecationWarning('Python versions below 3.8 are no longer supported by PAY.JP. Please use Python 3.8 or higher.')
 
 install_requires.append('requests >= 2.7.0')