GNOME.org
 

[gnome-music] Replace logger.warn with logger.warning

commit e040b487282c267ef5a85a8a18c722bf1cdd9cfd
Author: Janne Körkkö <jkorkko protonmail com>
Date:   Thu Feb 22 09:21:39 2018 +0200

    Replace logger.warn with logger.warning
    
    Replace deprecated logger.warn with logger.warning and use
    str.format() instead of % for formatting.
    
    Closes #153

 gnomemusic/albumartcache.py     | 32 ++++++++++++++++----------------
 gnomemusic/grilo.py             |  2 +-
 gnomemusic/player.py            | 10 +++++-----
 gnomemusic/playlists.py         | 16 ++++++++--------
 gnomemusic/query.py             |  4 ++--
 gnomemusic/scrobbler.py         |  8 ++++----
 gnomemusic/views/artistsview.py |  2 +-
 gnomemusic/views/songsview.py   |  2 +-
 8 files changed, 38 insertions(+), 38 deletions(-)
---
diff --git a/gnomemusic/albumartcache.py b/gnomemusic/albumartcache.py
index c74a42a..d022dfd 100644
--- a/gnomemusic/albumartcache.py
+++ b/gnomemusic/albumartcache.py
@@ -390,7 +390,7 @@ class Cache(GObject.GObject):
             try:
                 Gio.file_new_for_path(self.cache_dir).make_directory(None)
             except GLib.Error as error:
-                logger.warn(
+                logger.warning(
                     "Error: {}, {}".format(error.domain, error.message))
                 return
 
@@ -418,7 +418,7 @@ class Cache(GObject.GObject):
         try:
             stream = thumb_file.read_finish(result)
         except GLib.Error as error:
-            logger.warn("Error: {}, {}".format(error.domain, error.message))
+            logger.warning("Error: {}, {}".format(error.domain, error.message))
             stream.close_async(
                 GLib.PRIORITY_HIGH, None, self._close_stream, None)
             self.emit('miss')
@@ -432,7 +432,7 @@ class Cache(GObject.GObject):
         try:
             pixbuf = GdkPixbuf.Pixbuf.new_from_stream_finish(result)
         except GLib.Error as error:
-            logger.warn("Error: {}, {}".format(error.domain, error.message))
+            logger.warning("Error: {}, {}".format(error.domain, error.message))
             stream.close_async(
                 GLib.PRIORITY_HIGH, None, self._close_stream, None)
             self.emit('miss')
@@ -446,7 +446,7 @@ class Cache(GObject.GObject):
         try:
             stream.close_finish(result)
         except GLib.Error as error:
-            logger.warn("Error: {}, {}".format(error.domain, error.message))
+            logger.warning("Error: {}, {}".format(error.domain, error.message))
 
 
 class EmbeddedArt(GObject.GObject):
@@ -472,7 +472,7 @@ class EmbeddedArt(GObject.GObject):
             Gst.init(None)
             GstPbutils.pb_utils_init()
         except GLib.Error as error:
-            logger.warn("Error: {}, {}".format(error.domain, error.message))
+            logger.warning("Error: {}, {}".format(error.domain, error.message))
             return
 
         self._media_art = MediaArt.Process.new()
@@ -499,7 +499,7 @@ class EmbeddedArt(GObject.GObject):
         try:
             discoverer = GstPbutils.Discoverer.new(Gst.SECOND)
         except GLib.Error as error:
-            logger.warn("Error: {}, {}".format(error.domain, error.message))
+            logger.warning("Error: {}, {}".format(error.domain, error.message))
             self._lookup_cover_in_directory()
             return
 
@@ -518,7 +518,7 @@ class EmbeddedArt(GObject.GObject):
         success = discoverer.discover_uri_async(self._media.get_url())
 
         if not success:
-            logger.warn("Could not add url to discoverer.")
+            logger.warning("Could not add url to discoverer.")
             self.emit('unavailable')
             discoverer.stop()
             return
@@ -535,7 +535,7 @@ class EmbeddedArt(GObject.GObject):
         if (error is not None
                 or tags is None):
             if error:
-                logger.warn("Discoverer error: {}, {}".format(
+                logger.warning("Discoverer error: {}, {}".format(
                     Gst.CoreError(error.code), error.message))
             discoverer.stop()
             self.emit('unavailable')
@@ -566,7 +566,7 @@ class EmbeddedArt(GObject.GObject):
                 discoverer.stop()
                 return
             except GLib.Error as error:
-                logger.warn("Error: {}, {}".format(
+                logger.warning("Error: {}, {}".format(
                     MediaArt.Error(error.code), error.message))
 
         discoverer.stop()
@@ -639,7 +639,7 @@ class RemoteArt(GObject.GObject):
         try:
             src.delete_finish(result)
         except GLib.Error as error:
-            logger.warn("Error: {}, {}".format(error.domain, error.message))
+            logger.warning("Error: {}, {}".format(error.domain, error.message))
 
     @log
     def _splice_callback(self, src, result, data):
@@ -651,7 +651,7 @@ class RemoteArt(GObject.GObject):
         try:
             src.splice_finish(result)
         except GLib.Error as error:
-            logger.warn("Error: {}, {}".format(error.domain, error.message))
+            logger.warning("Error: {}, {}".format(error.domain, error.message))
             self.emit('unavailable')
             return
 
@@ -666,7 +666,7 @@ class RemoteArt(GObject.GObject):
             # FIXME: I/O blocking
             MediaArt.file_to_jpeg(tmp_file.get_path(), cache_path)
         except GLib.Error as error:
-            logger.warn("Error: {}, {}".format(error.domain, error.message))
+            logger.warning("Error: {}, {}".format(error.domain, error.message))
             self.emit('unavailable')
             return
 
@@ -680,21 +680,21 @@ class RemoteArt(GObject.GObject):
         try:
             src.close_finish(result)
         except GLib.Error as error:
-            logger.warn("Error: {}, {}".format(error.domain, error.message))
+            logger.warning("Error: {}, {}".format(error.domain, error.message))
 
     @log
     def _read_callback(self, src, result, data):
         try:
             istream = src.read_finish(result)
         except GLib.Error as error:
-            logger.warn("Error: {}, {}".format(error.domain, error.message))
+            logger.warning("Error: {}, {}".format(error.domain, error.message))
             self.emit('unavailable')
             return
 
         try:
             [tmp_file, iostream] = Gio.File.new_tmp()
         except GLib.Error as error:
-            logger.warn("Error: {}, {}".format(error.domain, error.message))
+            logger.warning("Error: {}, {}".format(error.domain, error.message))
             self.emit('unavailable')
             return
 
@@ -709,7 +709,7 @@ class RemoteArt(GObject.GObject):
     @log
     def _remote_album_art(self, source, param, item, count, error):
         if error:
-            logger.warn("Grilo error {}".format(error))
+            logger.warning("Grilo error {}".format(error))
             self.emit('unavailable')
             return
 
diff --git a/gnomemusic/grilo.py b/gnomemusic/grilo.py
index 86dc932..add7520 100644
--- a/gnomemusic/grilo.py
+++ b/gnomemusic/grilo.py
@@ -439,7 +439,7 @@ class Grilo(GObject.GObject):
             try:
                 has_next = conn.next_finish(res)
             except GLib.Error as err:
-                logger.warn("Error: %s, %s", err.__class__, err)
+                logger.warning("Error: {}, {}".format(err.__class__, err))
                 callback(False)
                 return
 
diff --git a/gnomemusic/player.py b/gnomemusic/player.py
index 5432377..51bdf43 100644
--- a/gnomemusic/player.py
+++ b/gnomemusic/player.py
@@ -186,7 +186,7 @@ class Player(GObject.GObject):
     def discover_item(self, item, callback, data=None):
         url = item.get_url()
         if not url:
-            logger.warn("The item %s doesn't have a URL set", item)
+            logger.warning("The item {} doesn't have a URL set".format(item))
             return
 
         if not url.startswith("file://"):
@@ -334,13 +334,13 @@ class Player(GObject.GObject):
             uri = media.get_url()
         else:
             uri = 'none'
-        logger.warn('URI: %s', uri)
+        logger.warning('URI: {}'.format(uri))
         error, debug = message.parse_error()
         debug = debug.split('\n')
         debug = [('     ') + line.lstrip() for line in debug]
         debug = '\n'.join(debug)
-        logger.warn('Error from element %s: %s', message.src.get_name(), error.message)
-        logger.warn('Debugging info:\n%s', debug)
+        logger.warning('Error from element {}: {}'.format(message.src.get_name(), error.message))
+        logger.warning('Debugging info:\n{}'.format(debug))
         self.play_next()
         return True
 
@@ -948,7 +948,7 @@ class Player(GObject.GObject):
                         self._lastfm.scrobble(current_media, self._time_stamp)
 
             except Exception as e:
-                logger.warn("Error: %s, %s", e.__class__, e)
+                logger.warning("Error: {}, {}".format(e.__class__, e))
         return True
 
     @log
diff --git a/gnomemusic/playlists.py b/gnomemusic/playlists.py
index 6d202b4..2cd72be 100644
--- a/gnomemusic/playlists.py
+++ b/gnomemusic/playlists.py
@@ -164,7 +164,7 @@ class Playlists(GObject.GObject):
             try:
                 cursor.next_finish(res)
             except GLib.Error as err:
-                logger.warn("Error: %s, %s", err.__class__, err)
+                logger.warning("Error: {}, {}".format(err.__class__, err))
                 return
 
             playlist.ID = cursor.get_integer(1)
@@ -181,7 +181,7 @@ class Playlists(GObject.GObject):
             try:
                 cursor = obj.query_finish(result)
             except GLib.Error as err:
-                logger.warn("Error: %s, %s", err.__class__, err)
+                logger.warning("Error: {}, {}".format(err.__class__, err))
                 return
 
             # Search for the playlist ID
@@ -208,7 +208,7 @@ class Playlists(GObject.GObject):
             try:
                 cursor.next_finish(res)
             except GLib.Error as err:
-                logger.warn("Error: %s, %s", err.__class__, err)
+                logger.warning("Error: {}, {}".format(err.__class__, err))
                 return
 
             playlist.ID = cursor.get_integer(0)
@@ -221,7 +221,7 @@ class Playlists(GObject.GObject):
             try:
                 cursor = obj.query_finish(res)
             except GLib.Error as err:
-                logger.warn("Error: %s, %s", err.__class__, err)
+                logger.warning("Error: {}, {}".format(err.__class__, err))
                 return
 
             cursor.next_async(None, playlist_next_async_cb, playlist)
@@ -282,7 +282,7 @@ class Playlists(GObject.GObject):
         try:
             cursor = connection.query_finish(res)
         except GLib.Error as err:
-            logger.warn("Error: %s, %s", err.__class__, err)
+            logger.warning("Error: {}, {}".format(err.__class__, err))
             return
 
         def callback(cursor, res, final_query):
@@ -292,7 +292,7 @@ class Playlists(GObject.GObject):
             try:
                 has_next = cursor.next_finish(res)
             except GLib.Error as err:
-                logger.warn("Error: %s, %s", err.__class__, err)
+                logger.warning("Error: {}, {}".format(err.__class__, err))
                 has_next = False
 
             # Only perform the update when the cursor reached the end
@@ -324,7 +324,7 @@ class Playlists(GObject.GObject):
             try:
                 cursor.next_finish(res)
             except GLib.Error as err:
-                logger.warn("Error: %s, %s", err.__class__, err)
+                logger.warning("Error: {}, {}".format(err.__class__, err))
                 return
 
             playlist_id = cursor.get_integer(0)
@@ -334,7 +334,7 @@ class Playlists(GObject.GObject):
             try:
                 cursor = conn.query_finish(res)
             except GLib.Error as err:
-                logger.warn("Error: %s, %s", err.__class__, err)
+                logger.warning("Error: {}, {}".format(err.__class__, err))
                 return
 
             if not cursor:
diff --git a/gnomemusic/query.py b/gnomemusic/query.py
index 53f044c..820d2b4 100644
--- a/gnomemusic/query.py
+++ b/gnomemusic/query.py
@@ -49,14 +49,14 @@ class Query():
             Query.music_folder = GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_MUSIC)
             assert Query.music_folder is not None
         except (TypeError, AssertionError):
-            logger.warn("XDG Music dir is not set")
+            logger.warning("XDG Music dir is not set")
             return
 
         Query.MUSIC_URI = Tracker.sparql_escape_string(GLib.filename_to_uri(Query.music_folder))
 
         for folder in [Query.music_folder]:
             if os.path.islink(folder):
-                logger.warn("%s is a symlink, this folder will be omitted", folder)
+                logger.warning("{} is a symlink, this folder will be omitted".format(folder))
 
     def __repr__(self):
         return '<Query>'
diff --git a/gnomemusic/scrobbler.py b/gnomemusic/scrobbler.py
index be25d10..d5fb142 100644
--- a/gnomemusic/scrobbler.py
+++ b/gnomemusic/scrobbler.py
@@ -61,7 +61,7 @@ class GoaLastFM(GObject.GObject):
         try:
             self._client = source.new_finish(result)
         except GLib.Error as error:
-            logger.warn("Error: {}, {}".format(
+            logger.warning("Error: {}, {}".format(
                 Goa.Error(error.code), error.message))
             return
 
@@ -205,11 +205,11 @@ class LastFmScrobbler(GObject.GObject):
             r = requests.post(
                 "https://ws.audioscrobbler.com/2.0/";, request_dict)
             if r.status_code != 200:
-                logger.warn("Failed to {} track: {} {}".format(
+                logger.warning("Failed to {} track: {} {}".format(
                     request_type_key, r.status_code, r.reason))
-                logger.warn(r.text)
+                logger.warning(r.text)
         except Exception as e:
-            logger.warn(e)
+            logger.warning(e)
 
     @log
     def scrobble(self, media, time_stamp):
diff --git a/gnomemusic/views/artistsview.py b/gnomemusic/views/artistsview.py
index e63e1c7..0b1d269 100644
--- a/gnomemusic/views/artistsview.py
+++ b/gnomemusic/views/artistsview.py
@@ -121,7 +121,7 @@ class ArtistsView(BaseView):
         try:
             itr = self.model.get_iter(path)
         except ValueError as err:
-            logger.warn("Error: %s, %s", err.__class__, err)
+            logger.warning("Error: {}, {}".format(err.__class__, err))
             return
 
         self._last_selection = itr
diff --git a/gnomemusic/views/songsview.py b/gnomemusic/views/songsview.py
index e52a87d..8f722ea 100644
--- a/gnomemusic/views/songsview.py
+++ b/gnomemusic/views/songsview.py
@@ -90,7 +90,7 @@ class SongsView(BaseView):
         try:
             itr = self.model.get_iter(path)
         except ValueError as err:
-            logger.warn("Error: {}, {}".format(err.__class__, err))
+            logger.warning("Error: {}, {}".format(err.__class__, err))
             return
 
         if self.model[itr][8] != self._error_icon_name:
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]