From 844a3c17cc086e9c86ebbd0f65a92a7db710bd56 Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Fri, 22 May 2020 19:19:02 -0600 Subject: [PATCH] Fixing mypy errors --- sublime/adapters/manager.py | 7 +++++-- sublime/ui/main.py | 4 ++-- tests/adapter_tests/subsonic_adapter_tests.py | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/sublime/adapters/manager.py b/sublime/adapters/manager.py index 85b2cfd..2cac00d 100644 --- a/sublime/adapters/manager.py +++ b/sublime/adapters/manager.py @@ -759,11 +759,14 @@ class AdapterManager: # TODO (#189): allow this to take a set of schemes @staticmethod def get_song_filename_or_stream( - song: Song, format: str = None, allow_song_downloads: bool = True, + song: Song, + format: str = None, + force_stream: bool = False, + allow_song_downloads: bool = True, ) -> str: assert AdapterManager._instance cached_song_filename = None - if AdapterManager._can_use_cache(False, "get_song_uri"): + if AdapterManager._can_use_cache(force_stream, "get_song_uri"): assert AdapterManager._instance.caching_adapter try: return AdapterManager._instance.caching_adapter.get_song_uri( diff --git a/sublime/ui/main.py b/sublime/ui/main.py index f018ef1..344d6b3 100644 --- a/sublime/ui/main.py +++ b/sublime/ui/main.py @@ -230,7 +230,7 @@ class MainWindow(Gtk.ApplicationWindow): return header def _create_label( - self, text: str, *args, halign=Gtk.Align.START, **kwargs + self, text: str, *args, halign: Gtk.Align = Gtk.Align.START, **kwargs ) -> Gtk.Label: label = Gtk.Label( use_markup=True, @@ -341,7 +341,7 @@ class MainWindow(Gtk.ApplicationWindow): self.connected_to_label = self._create_label( "No Music Source Selected", name="connected-to-label", - halign=Gtk.Align.CENTER + halign=Gtk.Align.CENTER, ) vbox.add(self.connected_to_label) diff --git a/tests/adapter_tests/subsonic_adapter_tests.py b/tests/adapter_tests/subsonic_adapter_tests.py index 9cd9ef1..236a91c 100644 --- a/tests/adapter_tests/subsonic_adapter_tests.py +++ b/tests/adapter_tests/subsonic_adapter_tests.py @@ -366,8 +366,8 @@ def test_get_artist(adapter: SubsonicAdapter): assert len(artist.similar_artists) == 20 assert (first_similar := artist.similar_artists[0]) assert first_similar - assert first_similar.name == 'Luke Combs' - assert first_similar.artist_image_url == 'ar-158' + assert first_similar.name == "Luke Combs" + assert first_similar.artist_image_url == "ar-158" def test_get_artist_with_good_image_url(adapter: SubsonicAdapter):