From d5343a85a6952e9a3112b987c487b401211749b2 Mon Sep 17 00:00:00 2001 From: Marinus Schraal Date: Fri, 15 Dec 2017 08:01:56 +0100 Subject: [PATCH] Pyflake warning fixes --- gnomemusic/albumartcache.py | 1 - gnomemusic/mpris.py | 1 - gnomemusic/notification.py | 2 +- gnomemusic/playlists.py | 3 +-- gnomemusic/query.py | 1 - gnomemusic/widgets/albumwidget.py | 4 +--- gnomemusic/widgets/artistalbumwidget.py | 5 ++--- gnomemusic/widgets/starhandlerwidget.py | 2 +- gnomemusic/window.py | 2 +- 9 files changed, 7 insertions(+), 14 deletions(-) diff --git a/gnomemusic/albumartcache.py b/gnomemusic/albumartcache.py index d9a1abc4a..17a6965ff 100644 --- a/gnomemusic/albumartcache.py +++ b/gnomemusic/albumartcache.py @@ -33,7 +33,6 @@ from math import pi import os import cairo -from gettext import gettext as _ import gi gi.require_version('MediaArt', '2.0') from gi.repository import (Gdk, GdkPixbuf, Gio, GLib, GObject, Gtk, MediaArt, diff --git a/gnomemusic/mpris.py b/gnomemusic/mpris.py index 40146fa72..3533e9f68 100644 --- a/gnomemusic/mpris.py +++ b/gnomemusic/mpris.py @@ -28,7 +28,6 @@ from gnomemusic.grilo import grilo from gnomemusic.playlists import Playlists import gnomemusic.utils as utils -from gettext import gettext as _ from gi.repository import GLib from gi.repository import Gio from gnomemusic import log diff --git a/gnomemusic/notification.py b/gnomemusic/notification.py index 2f6f7d388..61120797c 100644 --- a/gnomemusic/notification.py +++ b/gnomemusic/notification.py @@ -22,7 +22,7 @@ # 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 gi.repository import GLib, Grl, Notify +from gi.repository import GLib, Notify from gettext import gettext as _ diff --git a/gnomemusic/playlists.py b/gnomemusic/playlists.py index 7d2ed6991..5be6ad09e 100644 --- a/gnomemusic/playlists.py +++ b/gnomemusic/playlists.py @@ -32,7 +32,6 @@ from gnomemusic.grilo import grilo from gnomemusic.query import Query from gettext import gettext as _ import inspect -import time sparql_dateTime_format = "%Y-%m-%dT%H:%M:%SZ" from gnomemusic import log @@ -304,7 +303,7 @@ class Playlists(GObject.GObject): def cursor_callback(cursor, res, data): try: - has_next = cursor.next_finish(res) + cursor.next_finish(res) except GLib.Error as err: logger.warn("Error: %s, %s", err.__class__, err) return diff --git a/gnomemusic/query.py b/gnomemusic/query.py index 67c6257c2..95f26b085 100644 --- a/gnomemusic/query.py +++ b/gnomemusic/query.py @@ -25,7 +25,6 @@ # 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 gettext import gettext as _ from gi.repository import GLib, Tracker from gnomemusic import log import os diff --git a/gnomemusic/widgets/albumwidget.py b/gnomemusic/widgets/albumwidget.py index 8d12fb9b6..43928f0a8 100644 --- a/gnomemusic/widgets/albumwidget.py +++ b/gnomemusic/widgets/albumwidget.py @@ -23,13 +23,11 @@ # delete this exception statement from your version. from gettext import gettext as _, ngettext -from gi.repository import Gd, Gdk, GdkPixbuf, GLib, GObject, Gtk, Pango +from gi.repository import GdkPixbuf, GLib, GObject, Gtk from gnomemusic import log from gnomemusic.albumartcache import AlbumArtCache, DefaultIcon, ArtSize from gnomemusic.grilo import grilo -from gnomemusic.player import DiscoveryStatus -from gnomemusic.playlists import Playlists from gnomemusic.widgets.disclistboxwidget import DiscBox, DiscListBox import gnomemusic.utils as utils diff --git a/gnomemusic/widgets/artistalbumwidget.py b/gnomemusic/widgets/artistalbumwidget.py index 43dd6c60d..11a503dd3 100644 --- a/gnomemusic/widgets/artistalbumwidget.py +++ b/gnomemusic/widgets/artistalbumwidget.py @@ -22,13 +22,12 @@ # 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 gettext import gettext as _ -from gi.repository import Gdk, Gio, GLib, GObject, Gtk +from gi.repository import GLib, GObject, Gtk from gnomemusic import log from gnomemusic.albumartcache import AlbumArtCache, DefaultIcon, ArtSize from gnomemusic.grilo import grilo -from gnomemusic.widgets.disclistboxwidget import DiscBox, DiscListBox +from gnomemusic.widgets.disclistboxwidget import DiscBox import gnomemusic.utils as utils diff --git a/gnomemusic/widgets/starhandlerwidget.py b/gnomemusic/widgets/starhandlerwidget.py index 1651b2ac9..d8ba9713a 100644 --- a/gnomemusic/widgets/starhandlerwidget.py +++ b/gnomemusic/widgets/starhandlerwidget.py @@ -22,7 +22,7 @@ # 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 gi.repository import Gdk, GObject, Gtk +from gi.repository import GObject, Gtk from gnomemusic import log from gnomemusic.grilo import grilo diff --git a/gnomemusic/window.py b/gnomemusic/window.py index 60372d76f..f2a474d5f 100644 --- a/gnomemusic/window.py +++ b/gnomemusic/window.py @@ -30,7 +30,7 @@ # delete this exception statement from your version. from gi.repository import Gtk, Gdk, Gio, GLib -from gettext import gettext as _, ngettext +from gettext import gettext as _ from gnomemusic import log from gnomemusic import TrackerWrapper -- GitLab