GNOME.org
 

[gnome-music/wip/mschraal/core: 119/177] flake 8 fixes all over the place

commit f498c7c8472f99c3271763b5fe59e4124420b808
Author: Marinus Schraal <mschraal gnome org>
Date:   Wed Jun 26 15:20:14 2019 +0200

    flake 8 fixes all over the place

 gnomemusic/corealbum.py                      |  1 -
 gnomemusic/coreartist.py                     |  1 -
 gnomemusic/coredisc.py                       |  9 +++------
 gnomemusic/coremodel.py                      | 11 +----------
 gnomemusic/coreselection.py                  |  3 +--
 gnomemusic/coresong.py                       |  2 --
 gnomemusic/grilowrappers/grldleynasource.py  |  2 --
 gnomemusic/grilowrappers/grltrackersource.py |  6 ++----
 gnomemusic/player.py                         |  6 ++----
 gnomemusic/views/albumsview.py               |  1 -
 gnomemusic/views/artistsview.py              |  2 --
 gnomemusic/widgets/albumcover.py             |  3 +--
 gnomemusic/widgets/albumwidget2.py           |  6 +-----
 gnomemusic/widgets/artistalbumswidget.py     |  4 ++--
 gnomemusic/widgets/artistalbumwidget.py      |  6 +++---
 gnomemusic/widgets/disclistboxwidget.py      |  3 +--
 16 files changed, 17 insertions(+), 49 deletions(-)
---
diff --git a/gnomemusic/corealbum.py b/gnomemusic/corealbum.py
index 40d4e19a..85b445d4 100644
--- a/gnomemusic/corealbum.py
+++ b/gnomemusic/corealbum.py
@@ -3,7 +3,6 @@ gi.require_version('Grl', '0.3')
 from gi.repository import Gio, Grl, GObject
 
 from gnomemusic import log
-from gnomemusic.grilo import grilo
 import gnomemusic.utils as utils
 
 
diff --git a/gnomemusic/coreartist.py b/gnomemusic/coreartist.py
index f2519ac9..673702ae 100644
--- a/gnomemusic/coreartist.py
+++ b/gnomemusic/coreartist.py
@@ -3,7 +3,6 @@ gi.require_version('Grl', '0.3')
 from gi.repository import Gio, Grl, GObject
 
 from gnomemusic import log
-from gnomemusic.grilo import grilo
 import gnomemusic.utils as utils
 
 
diff --git a/gnomemusic/coredisc.py b/gnomemusic/coredisc.py
index a6d51854..5478ee9e 100644
--- a/gnomemusic/coredisc.py
+++ b/gnomemusic/coredisc.py
@@ -1,10 +1,6 @@
-import gi
-from gi.repository import Dazzle, GObject, Gio, Gfm, Grl, GLib
+from gi.repository import Dazzle, GObject, Gio, Gfm, Grl
 from gi._gi import pygobject_new_full
 
-from gnomemusic.coregrilo import CoreGrilo
-from gnomemusic.coresong import CoreSong
-
 
 class CoreDisc(GObject.GObject):
 
@@ -35,7 +31,8 @@ class CoreDisc(GObject.GObject):
                 self._coremodel.get_model())
             self._filter_model.set_filter_func(lambda a: False)
             self._sort_model = Gfm.SortListModel.new(self._filter_model)
-            self._sort_model.set_sort_func(self._wrap_sort_func(self._disc_sort))
+            self._sort_model.set_sort_func(
+                self._wrap_sort_func(self._disc_sort))
 
             self._model = self._sort_model
 
diff --git a/gnomemusic/coremodel.py b/gnomemusic/coremodel.py
index 0d2b43bc..c79ea315 100644
--- a/gnomemusic/coremodel.py
+++ b/gnomemusic/coremodel.py
@@ -1,6 +1,6 @@
 import gi
 gi.require_version('Dazzle', '1.0')
-from gi.repository import Dazzle, GObject, Gio, Gfm, Grl, GLib
+from gi.repository import Dazzle, GObject, Gio, Gfm
 from gi._gi import pygobject_new_full
 
 from gnomemusic import log
@@ -9,7 +9,6 @@ from gnomemusic.coreartist import CoreArtist
 from gnomemusic.coredisc import CoreDisc
 from gnomemusic.coregrilo import CoreGrilo
 from gnomemusic.coresong import CoreSong
-from gnomemusic.grilo import grilo
 from gnomemusic.player import PlayerPlaylist
 from gnomemusic.widgets.songwidget import SongWidget
 
@@ -104,11 +103,7 @@ class CoreModel(GObject.GObject):
 
         for disc in discs:
             nr = disc.get_album_disc_number()
-
-            print("DISC", disc, disc.get_title(), disc.get_album_disc_number())
-            print("MEDI", media, media.get_title(), media.get_album_disc_number())
             coredisc = CoreDisc(media, nr, self)
-
             disc_model.append(coredisc)
 
         def _disc_order_sort(disc_a, disc_b):
@@ -146,7 +141,6 @@ class CoreModel(GObject.GObject):
 
         return albums_model_sort
 
-
     def get_playlist_model(self):
         return self._playlist_model_sort
 
@@ -166,8 +160,6 @@ class CoreModel(GObject.GObject):
                             "state", model_song, "state",
                             GObject.BindingFlags.SYNC_CREATE)
 
-                        media_id = model_song.props.media.get_id()
-
                         if song.props.media.get_id() == coresong.get_id():
                             song.props.state = SongWidget.State.PLAYING
 
@@ -186,7 +178,6 @@ class CoreModel(GObject.GObject):
                                 "state", model_song, "state",
                                 GObject.BindingFlags.SYNC_CREATE)
 
-                            media_id = model_song.props.media.get_id()
                             if song.props.media.get_id() == coresong.get_id():
                                 song.props.state = SongWidget.State.PLAYING
 
diff --git a/gnomemusic/coreselection.py b/gnomemusic/coreselection.py
index f6f2e9ea..611367f3 100644
--- a/gnomemusic/coreselection.py
+++ b/gnomemusic/coreselection.py
@@ -1,4 +1,3 @@
-import gi
 from gi.repository import GObject
 
 
@@ -17,7 +16,7 @@ class CoreSelection(GObject.GObject):
         else:
             try:
                 self.props.selected_items.remove(coresong)
-            except ValueError as e:
+            except ValueError:
                 pass
 
         self.props.selected_items_count = len(self.props.selected_items)
diff --git a/gnomemusic/coresong.py b/gnomemusic/coresong.py
index 0fcb03de..6dd5c03e 100644
--- a/gnomemusic/coresong.py
+++ b/gnomemusic/coresong.py
@@ -4,7 +4,6 @@ from gi.repository import Grl, GObject
 
 from gnomemusic import log
 from gnomemusic.grilo import grilo
-from gnomemusic.widgets.songwidget import SongWidget
 import gnomemusic.utils as utils
 
 
@@ -77,4 +76,3 @@ class CoreSong(GObject.GObject):
         self.props.title = utils.get_media_title(media)
         self.props.track_number = media.get_track_number()
         self.props.url = media.get_url()
-
diff --git a/gnomemusic/grilowrappers/grldleynasource.py b/gnomemusic/grilowrappers/grldleynasource.py
index 54917557..5df3d546 100644
--- a/gnomemusic/grilowrappers/grldleynasource.py
+++ b/gnomemusic/grilowrappers/grldleynasource.py
@@ -2,9 +2,7 @@ import gi
 gi.require_version('Grl', '0.3')
 from gi.repository import Grl, GObject
 
-from gnomemusic.corealbum import CoreAlbum
 from gnomemusic.coreartist import CoreArtist
-from gnomemusic.coresong import CoreSong
 
 
 class GrlDLeynaSource(GObject.GObject):
diff --git a/gnomemusic/grilowrappers/grltrackersource.py b/gnomemusic/grilowrappers/grltrackersource.py
index 957b5601..bb523102 100644
--- a/gnomemusic/grilowrappers/grltrackersource.py
+++ b/gnomemusic/grilowrappers/grltrackersource.py
@@ -128,8 +128,6 @@ class GrlTrackerSource(GObject.GObject):
             query, self.METADATA_KEYS, options, check_album_cb)
 
     def _remove_media(self, media):
-        removed_url = media.get_url()
-
         try:
             coresong = self._hash.pop(media.get_id())
         except KeyError:
@@ -190,7 +188,6 @@ class GrlTrackerSource(GObject.GObject):
     def _add_media(self, media):
         self._requery_media(media.get_id())
 
-
     def _only_update_media(self, source, op_id, media, user_data, error):
         if error:
             print("ERROR", error)
@@ -417,7 +414,8 @@ class GrlTrackerSource(GObject.GObject):
             OPTIONAL { ?song nao:hasTag ?tag .
                        FILTER (?tag = nao:predefined-tag-favorite) } .
             FILTER ( tracker:id(?album) = %(album_id)s
-                     && nmm:setNumber(nmm:musicAlbumDisc(?song)) = %(disc_nr)s )
+                     && nmm:setNumber(nmm:musicAlbumDisc(?song)) = %(disc_nr)s
+                   )
         }
         """.replace('\n', ' ').strip() % {
             'album_id': album_id,
diff --git a/gnomemusic/player.py b/gnomemusic/player.py
index 28e9e3f6..d8c0e759 100644
--- a/gnomemusic/player.py
+++ b/gnomemusic/player.py
@@ -22,10 +22,9 @@
 # code, but you are not obligated to do so.  If you do not wish to do so,
 # delete this exception statement from your version.
 
-from collections import defaultdict
 from enum import IntEnum
 from itertools import chain
-from random import shuffle, randrange, randint
+from random import randint
 import logging
 import time
 
@@ -187,7 +186,7 @@ class PlayerPlaylist(GObject.GObject):
         :rtype: bool
         """
         if (self.props.position <= self._model.get_n_items() - 1
-                and  self.props.position > 0):
+                and self.props.position > 0):
             return True
 
         return False
@@ -509,7 +508,6 @@ class Player(GObject.GObject):
         self._gst_player.props.state = Playback.PLAYING
         return
 
-
         if (song_offset is not None
                 and not self._playlist.set_song(song_offset)):
             return False
diff --git a/gnomemusic/views/albumsview.py b/gnomemusic/views/albumsview.py
index c769ccc1..fe205de5 100644
--- a/gnomemusic/views/albumsview.py
+++ b/gnomemusic/views/albumsview.py
@@ -31,7 +31,6 @@ from gnomemusic.views.baseview import BaseView
 from gnomemusic.widgets.headerbar import HeaderBar
 from gnomemusic.widgets.albumcover import AlbumCover
 from gnomemusic.widgets.albumwidget2 import AlbumWidget2
-import gnomemusic.utils as utils
 
 
 class AlbumsView(BaseView):
diff --git a/gnomemusic/views/artistsview.py b/gnomemusic/views/artistsview.py
index 25d67a74..607237f4 100644
--- a/gnomemusic/views/artistsview.py
+++ b/gnomemusic/views/artistsview.py
@@ -28,11 +28,9 @@ from gi.repository import Gdk, Gtk
 
 from gnomemusic import log
 from gnomemusic.grilo import grilo
-from gnomemusic.player import PlayerPlaylist
 from gnomemusic.views.baseview import BaseView
 from gnomemusic.widgets.artistalbumswidget import ArtistAlbumsWidget
 from gnomemusic.widgets.sidebarrow import SidebarRow
-import gnomemusic.utils as utils
 
 logger = logging.getLogger(__name__)
 
diff --git a/gnomemusic/widgets/albumcover.py b/gnomemusic/widgets/albumcover.py
index 9cfe21d3..f388fe71 100644
--- a/gnomemusic/widgets/albumcover.py
+++ b/gnomemusic/widgets/albumcover.py
@@ -24,10 +24,9 @@
 
 import gi
 gi.require_version('Grl', '0.3')
-from gi.repository import Gdk, GLib, GObject, Grl, Gtk
+from gi.repository import Gdk, GLib, GObject, Gtk
 
 from gnomemusic import log
-from gnomemusic import utils
 from gnomemusic.albumartcache import Art
 from gnomemusic.corealbum import CoreAlbum
 from gnomemusic.widgets.twolinetip import TwoLineTip
diff --git a/gnomemusic/widgets/albumwidget2.py b/gnomemusic/widgets/albumwidget2.py
index 40f3634a..8e09043f 100644
--- a/gnomemusic/widgets/albumwidget2.py
+++ b/gnomemusic/widgets/albumwidget2.py
@@ -1,14 +1,11 @@
 from gettext import ngettext
-from gi.repository import GdkPixbuf, GObject, Grl, Gtk
+from gi.repository import GObject, Grl, Gtk
 
 from gnomemusic import log
 from gnomemusic.albumartcache import Art
-from gnomemusic.grilo import grilo
 from gnomemusic.player import PlayerPlaylist
 from gnomemusic.widgets.disclistboxwidget import DiscBox
 from gnomemusic.widgets.disclistboxwidget import DiscListBox  # noqa: F401
-from gnomemusic.widgets.songwidget import SongWidget
-import gnomemusic.utils as utils
 
 
 @Gtk.Template(resource_path='/org/gnome/Music/ui/AlbumWidget2.ui')
@@ -89,7 +86,6 @@ class AlbumWidget2(Gtk.EventBox):
 
         corealbum.connect("notify::duration", self._on_duration_changed)
 
-
     def _create_widget(self, disc):
         disc_box = self._create_disc_box(
             disc.props.disc_nr, disc.model)
diff --git a/gnomemusic/widgets/artistalbumswidget.py b/gnomemusic/widgets/artistalbumswidget.py
index f5fc28e6..5f77bbcc 100644
--- a/gnomemusic/widgets/artistalbumswidget.py
+++ b/gnomemusic/widgets/artistalbumswidget.py
@@ -29,7 +29,6 @@ from gi.repository import GObject, Gtk
 from gnomemusic import log
 from gnomemusic.player import PlayerPlaylist
 from gnomemusic.widgets.artistalbumwidget import ArtistAlbumWidget
-from gnomemusic.widgets.songwidget import SongWidget
 
 logger = logging.getLogger(__name__)
 
@@ -90,10 +89,11 @@ class ArtistAlbumsWidget(Gtk.Box):
         self.show_all()
 
     def _song_activated(self, widget, song_widget):
+        self._album = None
+
         if self.props.selection_mode:
             return
 
-        self._album = None
         def _on_playlist_loaded(klass):
             self._player.play(None, None, song_widget._media)
             self._player._app._coremodel.disconnect(signal_id)
diff --git a/gnomemusic/widgets/artistalbumwidget.py b/gnomemusic/widgets/artistalbumwidget.py
index 3c9cad52..fc239461 100644
--- a/gnomemusic/widgets/artistalbumwidget.py
+++ b/gnomemusic/widgets/artistalbumwidget.py
@@ -26,10 +26,8 @@ from gi.repository import GObject, Gtk
 
 from gnomemusic import log
 from gnomemusic.albumartcache import Art
-from gnomemusic.grilo import grilo
 from gnomemusic.widgets.disclistboxwidget import DiscBox
 from gnomemusic.widgets.songwidget import SongWidget
-import gnomemusic.utils as utils
 
 
 @Gtk.Template(resource_path='/org/gnome/Music/ui/ArtistAlbumWidget.ui')
@@ -46,7 +44,9 @@ class ArtistAlbumWidget(Gtk.Box):
     selection_mode = GObject.Property(type=bool, default=False)
 
     __gsignals__ = {
-        "song-activated": (GObject.SignalFlags.RUN_FIRST, None, (SongWidget, )),
+        "song-activated": (
+            GObject.SignalFlags.RUN_FIRST, None, (SongWidget, )
+        ),
     }
 
     def __repr__(self):
diff --git a/gnomemusic/widgets/disclistboxwidget.py b/gnomemusic/widgets/disclistboxwidget.py
index faa9a609..627bab89 100644
--- a/gnomemusic/widgets/disclistboxwidget.py
+++ b/gnomemusic/widgets/disclistboxwidget.py
@@ -27,7 +27,6 @@ from gi.repository import Gdk, GObject, Gtk
 
 from gnomemusic import log
 from gnomemusic.widgets.songwidget import SongWidget
-import gnomemusic.utils as utils
 
 
 class DiscSongsFlowBox(Gtk.ListBox):
@@ -58,7 +57,7 @@ class DiscBox(Gtk.Box):
     __gtype_name__ = 'DiscBox'
 
     _disc_label = Gtk.Template.Child()
-    #_disc_songs_flowbox = Gtk.Template.Child()
+    # _disc_songs_flowbox = Gtk.Template.Child()
     _list_box = Gtk.Template.Child()
 
     __gsignals__ = {
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]