Restyled by reorder-python-imports

librespot/ZeroconfServer.py

@@ -4,13 +4,16 @@ import concurrent.futures
 import random
 import socket
 
-from zeroconf import ServiceBrowser, ServiceInfo, Zeroconf
+from zeroconf import ServiceBrowser
+from zeroconf import ServiceInfo
+from zeroconf import Zeroconf
 
 from librespot.common import Utils
 from librespot.core import Session
 from librespot.crypto import DiffieHellman
 from librespot.proto import Connect
-from librespot.standard import Closeable, Runnable
+from librespot.standard import Closeable
+from librespot.standard import Runnable
 
 
 class ZeroconfServer(Closeable):

librespot/audio/AudioKeyManager.py

@@ -10,7 +10,8 @@ from librespot.common import Utils
 from librespot.core import Session
 from librespot.core.PacketsReceiver import PacketsReceiver
 from librespot.crypto import Packet
-from librespot.standard import ByteArrayOutputStream, BytesInputStream
+from librespot.standard import ByteArrayOutputStream
+from librespot.standard import BytesInputStream
 
 
 class AudioKeyManager(PacketsReceiver):

librespot/audio/PlayableContentFeeder.py

@@ -3,13 +3,17 @@ from __future__ import annotations
 import logging
 import typing
 
-from librespot.audio import GeneralAudioStream, HaltListener, NormalizationData
+from librespot.audio import GeneralAudioStream
+from librespot.audio import HaltListener
+from librespot.audio import NormalizationData
 from librespot.audio.cdn import CdnFeedHelper
 from librespot.audio.format import AudioQualityPicker
 from librespot.common.Utils import Utils
 from librespot.core import Session
-from librespot.metadata import PlayableId, TrackId
+from librespot.metadata import PlayableId
-from librespot.proto import Metadata, StorageResolve
+from librespot.metadata import TrackId
+from librespot.proto import Metadata
+from librespot.proto import StorageResolve
 
 
 class PlayableContentFeeder:

librespot/audio/cdn/CdnFeedHelper.py

@@ -5,11 +5,13 @@ import random
 import time
 import typing
 
-from librespot.audio import (HaltListener, NormalizationData,
+from librespot.audio import HaltListener
-                             PlayableContentFeeder)
+from librespot.audio import NormalizationData
+from librespot.audio import PlayableContentFeeder
 from librespot.common import Utils
 from librespot.core import Session
-from librespot.proto import Metadata, StorageResolve
+from librespot.proto import Metadata
+from librespot.proto import StorageResolve
 
 
 class CdnFeedHelper:

librespot/audio/cdn/CdnManager.py

@@ -8,9 +8,12 @@ import time
 import typing
 import urllib.parse
 
-from librespot.audio import GeneralAudioStream, GeneralWritableStream, StreamId
+from librespot.audio import GeneralAudioStream
+from librespot.audio import GeneralWritableStream
+from librespot.audio import StreamId
 from librespot.audio.AbsChunkedInputStream import AbsChunkedInputStream
-from librespot.audio.decrypt import AesAudioDecrypt, NoopAudioDecrypt
+from librespot.audio.decrypt import AesAudioDecrypt
+from librespot.audio.decrypt import NoopAudioDecrypt
 from librespot.audio.format import SuperAudioFormat
 from librespot.audio.storage import ChannelManager
 from librespot.common import Utils

librespot/audio/storage/ChannelManager.py

@@ -8,10 +8,13 @@ import typing
 
 from librespot.audio.storage import AudioFile
 from librespot.common import Utils
-from librespot.core import PacketsReceiver, Session
+from librespot.core import PacketsReceiver
+from librespot.core import Session
 from librespot.crypto import Packet
-from librespot.standard import (BytesInputStream, BytesOutputStream, Closeable,
+from librespot.standard import BytesInputStream
-                                Runnable)
+from librespot.standard import BytesOutputStream
+from librespot.standard import Closeable
+from librespot.standard import Runnable
 
 
 class ChannelManager(Closeable, PacketsReceiver.PacketsReceiver):

librespot/core/Session.py

@@ -13,23 +13,35 @@ import typing
 
 import defusedxml.ElementTree
 import requests
-from Crypto.Hash import HMAC, SHA1
+from Crypto.Hash import HMAC
+from Crypto.Hash import SHA1
 from Crypto.PublicKey import RSA
 from Crypto.Signature import PKCS1_v1_5
 
-from librespot.audio import AudioKeyManager, PlayableContentFeeder
+from librespot.audio import AudioKeyManager
+from librespot.audio import PlayableContentFeeder
 from librespot.audio.cdn import CdnManager
 from librespot.audio.storage import ChannelManager
 from librespot.cache import CacheManager
 from librespot.common.Utils import Utils
-from librespot.core import (ApResolver, EventService, SearchManager,
+from librespot.core import ApResolver
-                            TokenProvider)
+from librespot.core import EventService
-from librespot.crypto import CipherPair, DiffieHellman, Packet
+from librespot.core import SearchManager
-from librespot.dealer import ApiClient, DealerClient
+from librespot.core import TokenProvider
-from librespot.mercury import MercuryClient, SubListener
+from librespot.crypto import CipherPair
-from librespot.proto import Authentication, Connect, Keyexchange
+from librespot.crypto import DiffieHellman
+from librespot.crypto import Packet
+from librespot.dealer import ApiClient
+from librespot.dealer import DealerClient
+from librespot.mercury import MercuryClient
+from librespot.mercury import SubListener
+from librespot.proto import Authentication
+from librespot.proto import Connect
+from librespot.proto import Keyexchange
 from librespot.proto.ExplicitContentPubsub import UserAttributesUpdate
-from librespot.standard import BytesInputStream, Closeable, Proxy
+from librespot.standard import BytesInputStream
+from librespot.standard import Closeable
+from librespot.standard import Proxy
 from librespot.Version import Version
 
 

librespot/core/TokenProvider.py

@@ -3,7 +3,8 @@ from __future__ import annotations
 import logging
 import typing
 
-from librespot.core import Session, TimeProvider
+from librespot.core import Session
+from librespot.core import TimeProvider
 from librespot.mercury import MercuryRequests
 
 

librespot/dealer/ApiClient.py

@@ -4,8 +4,13 @@ import typing
 import requests
 
 from librespot.core.ApResolver import ApResolver
-from librespot.metadata import AlbumId, ArtistId, EpisodeId, ShowId, TrackId
+from librespot.metadata import AlbumId
-from librespot.proto import Connect, Metadata
+from librespot.metadata import ArtistId
+from librespot.metadata import EpisodeId
+from librespot.metadata import ShowId
+from librespot.metadata import TrackId
+from librespot.proto import Connect
+from librespot.proto import Metadata
 from librespot.standard import Closeable
 
 

librespot/mercury/MercuryClient.py

@@ -7,12 +7,17 @@ import threading
 import typing
 
 from librespot.common import Utils
-from librespot.core import PacketsReceiver, Session
+from librespot.core import PacketsReceiver
+from librespot.core import Session
 from librespot.crypto import Packet
-from librespot.mercury import (JsonMercuryRequest, RawMercuryRequest,
+from librespot.mercury import JsonMercuryRequest
-                               SubListener)
+from librespot.mercury import RawMercuryRequest
-from librespot.proto import Mercury, Pubsub
+from librespot.mercury import SubListener
-from librespot.standard import BytesInputStream, BytesOutputStream, Closeable
+from librespot.proto import Mercury
+from librespot.proto import Pubsub
+from librespot.standard import BytesInputStream
+from librespot.standard import BytesOutputStream
+from librespot.standard import Closeable
 
 
 class MercuryClient(PacketsReceiver.PacketsReceiver, Closeable):

librespot/metadata/__init__.py

@@ -2,7 +2,8 @@ from __future__ import annotations
 
 import re
 
-from librespot.common import Base62, Utils
+from librespot.common import Base62
+from librespot.common import Utils
 from librespot.proto.ContextTrack import ContextTrack
 
 

librespot/player/Player.py

@@ -6,7 +6,8 @@ import time
 import typing
 
 from librespot.core.Session import Session
-from librespot.player import PlayerConfiguration, StateWrapper
+from librespot.player import PlayerConfiguration
+from librespot.player import StateWrapper
 from librespot.player.metrics import PlaybackMetrics
 from librespot.player.mixing import AudioSink
 from librespot.player.playback.PlayerSession import PlayerSession

librespot/player/StateWrapper.py

@@ -4,11 +4,14 @@ import typing
 
 from librespot.core import Session
 from librespot.dealer import DealerClient
-from librespot.player import Player, PlayerConfiguration
+from librespot.player import Player
+from librespot.player import PlayerConfiguration
 from librespot.player.state import DeviceStateHandler
 from librespot.proto import Connect
-from librespot.proto.Player import (ContextPlayerOptions, PlayerState,
+from librespot.proto.Player import ContextPlayerOptions
-                                    Restrictions, Suppressions)
+from librespot.proto.Player import PlayerState
+from librespot.proto.Player import Restrictions
+from librespot.proto.Player import Suppressions
 
 
 class StateWrapper(DeviceStateHandler.Listener, DealerClient.MessageListener):

librespot/player/state/DeviceStateHandler.py

@@ -11,7 +11,8 @@ import urllib.parse
 from librespot.common import Utils
 from librespot.core import Session
 from librespot.player import PlayerConfiguration
-from librespot.proto import Connect, Player
+from librespot.proto import Connect
+from librespot.proto import Player
 
 
 class DeviceStateHandler: