fix: reorder imports to maintain consistency and improve readability

Author: wozozo

.github/workflows/ruff.yml

@@ -10,7 +10,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.8'
+          python-version: '3.13'
           cache: 'pip'
       - name: Install dependencies
         run: |

payjp/api_requestor.py

@@ -6,11 +6,12 @@
 import json
 import logging
 import platform
-import time
 import random
+import time
 from urllib.parse import urlencode, urlsplit, urlunsplit
 
 import payjp
+
 from . import (
     error,
     http_client,

payjp/error.py

@@ -8,7 +8,7 @@ def __init__(self, message=None, http_body=None, http_status=None, json_body=Non
         if http_body and hasattr(http_body, "decode"):
             try:
                 http_body = http_body.decode("utf-8")
-            except:
+            except Exception:
                 http_body = (
                     "<Could not decode body as utf-8. Please report to support@pay.jp>"
                 )

payjp/http_client.py

@@ -1,12 +1,11 @@
 # coding: utf-8
 
 import textwrap
-import warnings
-
-from payjp import error
 
 import requests
 
+from payjp import error
+
 
 def new_default_http_client(*args, **kwargs):
     impl = RequestsClient

payjp/test/helper.py

@@ -1,12 +1,11 @@
 import datetime
-import json
 import os
 import random
 import re
 import string
 import unittest
 
-from mock import patch, Mock
+from mock import Mock, patch
 
 import payjp
 

payjp/test/test_http_client.py

@@ -1,11 +1,11 @@
 # coding: utf-8
 
 import unittest
+import warnings
 
 from mock import Mock
 
 import payjp
-
 from payjp.test.helper import PayjpUnitTestCase
 
 VALID_API_METHODS = ("get", "post", "delete")
@@ -15,11 +15,11 @@ class HttpClientTests(PayjpUnitTestCase):
     def setUp(self):
         super(HttpClientTests, self).setUp()
 
-        self.original_filters = payjp.http_client.warnings.filters[:]
-        payjp.http_client.warnings.simplefilter("ignore")
+        self.original_filters = warnings.filters[:]
+        warnings.simplefilter("ignore")
 
     def tearDown(self):
-        payjp.http_client.warnings.filters = self.original_filters
+        warnings.filters = self.original_filters
 
         super(HttpClientTests, self).tearDown()
 

payjp/test/test_integration.py

@@ -1,9 +1,9 @@
 # coding: utf-8
 
 import unittest
-import payjp
 
-from payjp.test.helper import PayjpTestCase, NOW, DUMMY_CARD
+import payjp
+from payjp.test.helper import DUMMY_CARD, NOW, PayjpTestCase
 
 
 class AuthenticationErrorTest(PayjpTestCase):

payjp/test/test_requestor.py

@@ -5,10 +5,9 @@
 import unittest
 from urllib.parse import parse_qsl, urlsplit
 
-from mock import Mock, MagicMock, patch
+from mock import Mock, patch
 
 import payjp
-
 from payjp.test.helper import PayjpUnitTestCase
 
 VALID_API_METHODS = ("get", "post", "delete")

payjp/test/test_resources.py

@@ -1,24 +1,22 @@
 # coding: utf-8
 
 import pickle
-import sys
 import unittest
 
 import payjp
 import payjp.resource
-
 from payjp.test.helper import (
-    PayjpUnitTestCase,
-    PayjpApiTestCase,
-    MyListable,
-    MyCreatable,
-    MyUpdateable,
-    MyDeletable,
-    MyResource,
-    NOW,
     DUMMY_CARD,
     DUMMY_CHARGE,
     DUMMY_PLAN,
+    NOW,
+    MyCreatable,
+    MyDeletable,
+    MyListable,
+    MyResource,
+    MyUpdateable,
+    PayjpApiTestCase,
+    PayjpUnitTestCase,
 )
 
 
@@ -129,9 +127,6 @@ def test_repr(self):
 
         res = repr(obj)
 
-        if sys.version_info[0] < 3:
-            res = unicode(repr(obj), "utf-8")
-
         self.assertTrue("<PayjpObject \u4e00boo\u1f00" in res)
         self.assertTrue("id=foo" in res)
 

tox.ini

@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = pypy3, py36, py37, py38, py39, ruff
+envlist = py38, py39, py310, py311, py312, py313 ruff
 
 [testenv]
 deps =