Merge branch 'master' of github.com:spotipy-dev/spotipy into v3

tests/unit/test_oauth.py

@@ -1,14 +1,13 @@
 import io
 import json
 import unittest
-
 import unittest.mock as mock
 import urllib.parse as urllibparse
 
 from spotipy import SpotifyOAuth, SpotifyPKCE
-from spotipy.oauth2 import SpotifyClientCredentials, SpotifyOauthError
-from spotipy.oauth2 import SpotifyStateError
-from spotipy import MemoryCacheHandler, CacheFileHandler
+from spotipy.cache_handler import CacheFileHandler, MemoryCacheHandler
+from spotipy.oauth2 import (SpotifyClientCredentials, SpotifyOauthError,
+                            SpotifyStateError)
 
 patch = mock.patch
 DEFAULT = mock.DEFAULT
@@ -323,8 +322,8 @@ class TestSpotifyPKCE(unittest.TestCase):
         self.assertTrue(auth.code_challenge)
 
     def test_code_verifier_and_code_challenge_are_correct(self):
-        import hashlib
         import base64
+        import hashlib
         auth = SpotifyPKCE("CLID", "REDIR")
         auth.get_pkce_handshake_parameters()
         self.assertEqual(auth.code_challenge,

tests/unit/test_scopes.py

@@ -1,6 +1,7 @@
 from unittest import TestCase
-from spotipy.scope import Scope
+
 from spotipy.oauth2 import SpotifyAuthBase
+from spotipy.scope import Scope
 
 
 class SpotipyScopeTest(TestCase):