From 41c312dd68b53c5bb94b57ddd625c575bf964213 Mon Sep 17 00:00:00 2001 From: auouymous Date: Sun, 17 Apr 2022 03:07:51 -0600 Subject: [PATCH] Change deprecated logger.warn() to logger.warning(). --- bin/gpo | 2 +- share/gpodder/extensions/audio_converter.py | 2 +- .../gpodder/extensions/command_on_download.py | 4 ++-- .../extensions/enqueue_in_mediaplayer.py | 2 +- share/gpodder/extensions/mpris-listener.py | 4 ++-- share/gpodder/extensions/normalize_audio.py | 2 +- share/gpodder/extensions/rm_ogg_cover.py | 2 +- share/gpodder/extensions/taskbar_progress.py | 2 +- share/gpodder/extensions/ted_subtitles.py | 4 ++-- share/gpodder/extensions/video_converter.py | 2 +- src/gpodder/common.py | 2 +- src/gpodder/config.py | 6 ++--- src/gpodder/coverart.py | 4 ++-- src/gpodder/download.py | 4 ++-- src/gpodder/extensions.py | 2 +- src/gpodder/feedcore.py | 2 +- src/gpodder/gtkui/app.py | 2 +- src/gpodder/gtkui/desktop/podcastdirectory.py | 8 +++---- src/gpodder/gtkui/desktopfile.py | 2 +- src/gpodder/gtkui/main.py | 10 ++++----- src/gpodder/gtkui/model.py | 2 +- src/gpodder/gtkui/services.py | 4 ++-- src/gpodder/log.py | 4 ++-- src/gpodder/model.py | 14 ++++++------ src/gpodder/my.py | 12 +++++----- src/gpodder/plugins/soundcloud.py | 2 +- src/gpodder/sync.py | 8 +++---- src/gpodder/syncui.py | 2 +- src/gpodder/util.py | 22 +++++++++---------- 29 files changed, 69 insertions(+), 69 deletions(-) diff --git a/bin/gpo b/bin/gpo index 0315f7b2..d4b8ba23 100755 --- a/bin/gpo +++ b/bin/gpo @@ -379,7 +379,7 @@ class gPodderCli(object): podcast.rename(title) podcast.save() except Exception as e: - logger.warn('Cannot subscribe: %s', e, exc_info=True) + logger.warning('Cannot subscribe: %s', e, exc_info=True) if hasattr(e, 'strerror'): self._error(e.strerror) else: diff --git a/share/gpodder/extensions/audio_converter.py b/share/gpodder/extensions/audio_converter.py index 6e48b3b9..167ce70a 100644 --- a/share/gpodder/extensions/audio_converter.py +++ b/share/gpodder/extensions/audio_converter.py @@ -133,7 +133,7 @@ class gPodderExtension: logger.info('Converted audio file to %(format)s.' % {'format': new_extension}) gpodder.user_extensions.on_notification_show(_('File converted'), episode.title) else: - logger.warn('Error converting audio file: %s / %s', stdout, stderr) + logger.warning('Error converting audio file: %s / %s', stdout, stderr) gpodder.user_extensions.on_notification_show(_('Conversion failed'), episode.title) def _convert_episodes(self, episodes): diff --git a/share/gpodder/extensions/command_on_download.py b/share/gpodder/extensions/command_on_download.py index dce9ade4..51374d9c 100644 --- a/share/gpodder/extensions/command_on_download.py +++ b/share/gpodder/extensions/command_on_download.py @@ -45,7 +45,7 @@ class gPodderExtension: def read_episode_info(self, episode): filename = episode.local_filename(create=False, check_only=True) if filename is None: - logger.warn("%s: missing episode filename", __title__) + logger.warning("%s: missing episode filename", __title__) return None info = { 'filename': filename, @@ -74,4 +74,4 @@ class gPodderExtension: if proc.returncode == 0: logger.info("%s succeeded", command) else: - logger.warn("%s run with exit code %i", command, proc.returncode) + logger.warning("%s run with exit code %i", command, proc.returncode) diff --git a/share/gpodder/extensions/enqueue_in_mediaplayer.py b/share/gpodder/extensions/enqueue_in_mediaplayer.py index b8441f6b..d8ad66ff 100644 --- a/share/gpodder/extensions/enqueue_in_mediaplayer.py +++ b/share/gpodder/extensions/enqueue_in_mediaplayer.py @@ -72,7 +72,7 @@ class Win32Player(Player): self.command = win32_read_registry_key(self.command) return True except Exception as e: - logger.warn('Win32 player not found: %s (%s)', self.command, e) + logger.warning('Win32 player not found: %s (%s)', self.command, e) return False diff --git a/share/gpodder/extensions/mpris-listener.py b/share/gpodder/extensions/mpris-listener.py index 0e5ba1c9..b2959854 100644 --- a/share/gpodder/extensions/mpris-listener.py +++ b/share/gpodder/extensions/mpris-listener.py @@ -255,10 +255,10 @@ class MPRISDBusReceiver(object): invalidated_properties, path=None, sender=None): if interface_name != self.INTERFACE_MPRIS: if interface_name not in self.OTHER_MPRIS_INTERFACES: - logger.warn('unexpected interface: %s, props=%r', interface_name, list(changed_properties.keys())) + logger.warning('unexpected interface: %s, props=%r', interface_name, list(changed_properties.keys())) return if sender is None: - logger.warn('No sender associated to D-Bus signal, please report a bug') + logger.warning('No sender associated to D-Bus signal, please report a bug') return collected_info = {} diff --git a/share/gpodder/extensions/normalize_audio.py b/share/gpodder/extensions/normalize_audio.py index b8a56285..cc9ad763 100644 --- a/share/gpodder/extensions/normalize_audio.py +++ b/share/gpodder/extensions/normalize_audio.py @@ -105,7 +105,7 @@ class gPodderExtension: gpodder.user_extensions.on_notification_show(_('File normalized'), episode.title) else: - logger.warn('normalize-audio failed: %s / %s', stdout, stderr) + logger.warning('normalize-audio failed: %s / %s', stdout, stderr) def convert_episodes(self, episodes): for episode in episodes: diff --git a/share/gpodder/extensions/rm_ogg_cover.py b/share/gpodder/extensions/rm_ogg_cover.py index 216db118..e2e7e569 100644 --- a/share/gpodder/extensions/rm_ogg_cover.py +++ b/share/gpodder/extensions/rm_ogg_cover.py @@ -97,4 +97,4 @@ class gPodderExtension: logger.info('Removed cover art from OGG file: %s', filename) ogg.save() except Exception as e: - logger.warn('Failed to remove OGG cover: %s', e, exc_info=True) + logger.warning('Failed to remove OGG cover: %s', e, exc_info=True) diff --git a/share/gpodder/extensions/taskbar_progress.py b/share/gpodder/extensions/taskbar_progress.py index 5838dd30..867c675d 100644 --- a/share/gpodder/extensions/taskbar_progress.py +++ b/share/gpodder/extensions/taskbar_progress.py @@ -176,7 +176,7 @@ class gPodderExtension: if self.window_handle is None: if not self.restart_warning: return - logger.warn("No window handle available, a restart max fix this") + logger.warning("No window handle available, a restart max fix this") self.restart_warning = False return if 0 < progress < 1: diff --git a/share/gpodder/extensions/ted_subtitles.py b/share/gpodder/extensions/ted_subtitles.py index 4ff161f4..475e4b0d 100644 --- a/share/gpodder/extensions/ted_subtitles.py +++ b/share/gpodder/extensions/ted_subtitles.py @@ -60,7 +60,7 @@ class gPodderExtension(object): try: response = util.urlopen(url).read() except Exception as e: - logger.warn("subtitle url returned error %s", e) + logger.warning("subtitle url returned error %s", e) return '' return response @@ -105,7 +105,7 @@ class gPodderExtension(object): with open(srt_filename, 'w+') as srtFile: srtFile.write(sub.encode("utf-8")) except Exception as e: - logger.warn("Can't write srt file: %s", e) + logger.warning("Can't write srt file: %s", e) def on_episode_delete(self, episode, filename): srt_filename = self.get_srt_filename(filename) diff --git a/share/gpodder/extensions/video_converter.py b/share/gpodder/extensions/video_converter.py index eb33c3ad..363bc34f 100644 --- a/share/gpodder/extensions/video_converter.py +++ b/share/gpodder/extensions/video_converter.py @@ -114,7 +114,7 @@ class gPodderExtension: logger.info('Converted video file to %(format)s.' % {'format': self.config.output_format}) gpodder.user_extensions.on_notification_show(_('File converted'), episode.title) else: - logger.warn('Error converting video file: %s / %s', stdout, stderr) + logger.warning('Error converting video file: %s / %s', stdout, stderr) gpodder.user_extensions.on_notification_show(_('Conversion failed'), episode.title) def _convert_episodes(self, episodes): diff --git a/src/gpodder/common.py b/src/gpodder/common.py index 9a69cfad..f2d44e1a 100644 --- a/src/gpodder/common.py +++ b/src/gpodder/common.py @@ -87,7 +87,7 @@ def find_partial_downloads(channels, start_progress_callback, progress_callback, break for f in partial_files: - logger.warn('Partial file without episode: %s', f) + logger.warning('Partial file without episode: %s', f) util.delete_file(f) # never delete partial: either we can't clean them up because we offer to diff --git a/src/gpodder/config.py b/src/gpodder/config.py index e22b4cf8..99c29f37 100644 --- a/src/gpodder/config.py +++ b/src/gpodder/config.py @@ -319,7 +319,7 @@ class Config(object): if callback not in self.__observers: self.__observers.append(callback) else: - logger.warn('Observer already added: %s', repr(callback)) + logger.warning('Observer already added: %s', repr(callback)) def remove_observer(self, callback): """ @@ -328,7 +328,7 @@ class Config(object): if callback in self.__observers: self.__observers.remove(callback) else: - logger.warn('Observer not added: %s', repr(callback)) + logger.warning('Observer not added: %s', repr(callback)) def all_keys(self): return self.__json_config._keys_iter() @@ -376,7 +376,7 @@ class Config(object): data = open(self.__filename, 'rt').read() new_keys_added = self.__json_config._restore(data) except: - logger.warn('Cannot parse config file: %s', + logger.warning('Cannot parse config file: %s', self.__filename, exc_info=True) new_keys_added = False diff --git a/src/gpodder/coverart.py b/src/gpodder/coverart.py index ad7c441a..339d4e7c 100644 --- a/src/gpodder/coverart.py +++ b/src/gpodder/coverart.py @@ -91,7 +91,7 @@ class CoverDownloader(object): raise ValueError(msg) data = response.content except Exception as e: - logger.warn('Cover art download failed: %s', e) + logger.warning('Cover art download failed: %s', e) return self._fallback_filename(title) try: @@ -113,7 +113,7 @@ class CoverDownloader(object): return filename + extension except Exception as e: - logger.warn('Cannot save cover art', exc_info=True) + logger.warning('Cannot save cover art', exc_info=True) # Fallback to cover art based on the podcast title return self._fallback_filename(title) diff --git a/src/gpodder/download.py b/src/gpodder/download.py index 1293319e..76e2b067 100644 --- a/src/gpodder/download.py +++ b/src/gpodder/download.py @@ -258,7 +258,7 @@ class DownloadURLOpener: if current_size > 0: headers['Range'] = 'bytes=%s-' % (current_size) except: - logger.warn('Cannot resume download: %s', filename, exc_info=True) + logger.warning('Cannot resume download: %s', filename, exc_info=True) tfp = None current_size = 0 @@ -292,7 +292,7 @@ class DownloadURLOpener: tfp.close() tfp = open(filename, 'wb') current_size = 0 - logger.warn('Cannot resume: Invalid Content-Range (RFC2616).') + logger.warning('Cannot resume: Invalid Content-Range (RFC2616).') result = headers, resp.url bs = 1024 * 8 diff --git a/src/gpodder/extensions.py b/src/gpodder/extensions.py index 4ef1c4d6..0509387d 100644 --- a/src/gpodder/extensions.py +++ b/src/gpodder/extensions.py @@ -367,7 +367,7 @@ class ExtensionManager(object): 'enabled' if new_enabled else 'disabled') container.set_enabled(new_enabled) if new_enabled and not container.enabled: - logger.warn('Could not enable extension: %s', + logger.warning('Could not enable extension: %s', container.error) self.core.config.extensions.enabled = [x for x in self.core.config.extensions.enabled diff --git a/src/gpodder/feedcore.py b/src/gpodder/feedcore.py index 39cacc3f..2563aa32 100644 --- a/src/gpodder/feedcore.py +++ b/src/gpodder/feedcore.py @@ -206,7 +206,7 @@ class Fetcher(object): self.fetch(ad._resolved_url, etag=None, modified=None, autodiscovery=False, **kwargs) return Result(NEW_LOCATION, ad._resolved_url) except Exception as e: - logger.warn('Feed autodiscovery failed', exc_info=True) + logger.warning('Feed autodiscovery failed', exc_info=True) # Second, try to resolve the URL new_url = self._resolve_url(url) diff --git a/src/gpodder/gtkui/app.py b/src/gpodder/gtkui/app.py index 56902c24..8db0d4b9 100644 --- a/src/gpodder/gtkui/app.py +++ b/src/gpodder/gtkui/app.py @@ -172,7 +172,7 @@ class gPodderApplication(Gtk.Application): self.bus_name = dbus.service.BusName(gpodder.dbus_bus_name, bus=gpodder.dbus_session_bus) except dbus.exceptions.DBusException as dbe: - logger.warn('Cannot get "on the bus".', exc_info=True) + logger.warning('Cannot get "on the bus".', exc_info=True) dlg = Gtk.MessageDialog(None, Gtk.DialogFlags.MODAL, Gtk.MessageType.ERROR, Gtk.ButtonsType.CLOSE, _('Cannot start gPodder')) dlg.format_secondary_markup(_('D-Bus error: %s') % (str(dbe),)) diff --git a/src/gpodder/gtkui/desktop/podcastdirectory.py b/src/gpodder/gtkui/desktop/podcastdirectory.py index 79cdd5c4..00554a58 100644 --- a/src/gpodder/gtkui/desktop/podcastdirectory.py +++ b/src/gpodder/gtkui/desktop/podcastdirectory.py @@ -89,7 +89,7 @@ class DirectoryProvidersModel(Gtk.ListStore): try: pixbuf = GdkPixbuf.Pixbuf.new_from_file(os.path.join(gpodder.images_folder, provider.icon)) if provider.icon else None except Exception as e: - logger.warn('Could not load icon: %s (%s)', provider.icon or '-', e) + logger.warning('Could not load icon: %s (%s)', provider.icon or '-', e) pixbuf = None self.append((Pango.Weight.NORMAL, provider.name, pixbuf, provider)) @@ -203,7 +203,7 @@ class gPodderPodcastDirectory(BuilderWidget): try: tags = [(t.tag, t.weight) for t in provider.get_tags()] except Exception as e: - logger.warn('Got exception while loading tags: %s', e) + logger.warning('Got exception while loading tags: %s', e) tags = [] @util.idle_add @@ -251,7 +251,7 @@ class gPodderPodcastDirectory(BuilderWidget): try: podcasts = callback() except Exception as e: - logger.warn('Got exception while loading podcasts: %s', e) + logger.warning('Got exception while loading podcasts: %s', e) podcasts = [] @util.idle_add @@ -263,7 +263,7 @@ class gPodderPodcastDirectory(BuilderWidget): if original_provider == self.current_provider: self.podcasts_model.load(podcasts or []) else: - logger.warn('Ignoring update from old thread') + logger.warning('Ignoring update from old thread') self.en_query.set_sensitive(True) self.bt_search.set_sensitive(True) diff --git a/src/gpodder/gtkui/desktopfile.py b/src/gpodder/gtkui/desktopfile.py index 2cc93ec9..3b937083 100644 --- a/src/gpodder/gtkui/desktopfile.py +++ b/src/gpodder/gtkui/desktopfile.py @@ -177,7 +177,7 @@ class UserAppsReader(object): caption, cmdline, ';'.join(typ + '/*' for typ in types), None)) except Exception as e: - logger.warn('Parse HKEY error: %s (%s)', hkey, e) + logger.warning('Parse HKEY error: %s (%s)', hkey, e) for dir in userappsdirs: if os.path.exists(dir): diff --git a/src/gpodder/gtkui/main.py b/src/gpodder/gtkui/main.py index 43fac8ed..52bf4082 100644 --- a/src/gpodder/gtkui/main.py +++ b/src/gpodder/gtkui/main.py @@ -1840,8 +1840,8 @@ class gPodder(BuilderWidget, dbus.service.Object): def save_episodes_as_file(self, episodes): def do_save_episode(copy_from, copy_to): if os.path.exists(copy_to): - logger.warn(copy_from) - logger.warn(copy_to) + logger.warning(copy_from) + logger.warning(copy_to) title = _('File already exists') d = {'filename': os.path.basename(copy_to)} message = _('A file named "%(filename)s" already exists. Do you want to replace it?') % d @@ -1850,7 +1850,7 @@ class gPodder(BuilderWidget, dbus.service.Object): try: shutil.copyfile(copy_from, copy_to) except (OSError, IOError) as e: - logger.warn('Error copying from %s to %s: %r', copy_from, copy_to, e, exc_info=True) + logger.warning('Error copying from %s to %s: %r', copy_from, copy_to, e, exc_info=True) folder, filename = os.path.split(copy_to) # Remove characters not supported by VFAT (#282) new_filename = re.sub(r"[\"*/:<>?\\|]", "_", filename) @@ -1889,7 +1889,7 @@ class gPodder(BuilderWidget, dbus.service.Object): msg = _('Error saving to local folder: %(error)r.\n' 'Would you like to continue?') % dict(error=e) if not self.show_confirmation(msg, _('Error saving to local folder')): - logger.warn("Save to Local Folder cancelled following error") + logger.warning("Save to Local Folder cancelled following error") break else: self.notification(_('Error saving to local folder: %(error)r') % dict(error=e), @@ -3551,7 +3551,7 @@ class gPodder(BuilderWidget, dbus.service.Object): up_to_date, version, released, days = util.get_update_info() except Exception as e: if silent: - logger.warn('Could not check for updates.', exc_info=True) + logger.warning('Could not check for updates.', exc_info=True) else: title = _('Could not check for updates') message = _('Please try again later.') diff --git a/src/gpodder/gtkui/model.py b/src/gpodder/gtkui/model.py index 4243b8cd..45e6bf09 100644 --- a/src/gpodder/gtkui/model.py +++ b/src/gpodder/gtkui/model.py @@ -743,7 +743,7 @@ class PodcastListModel(Gtk.ListStore): return None return pixbuf except Exception as e: - logger.warn('Could not load cached cover art for %s', channel.url, exc_info=True) + logger.warning('Could not load cached cover art for %s', channel.url, exc_info=True) channel.cover_thumb = None channel.save() return None diff --git a/src/gpodder/gtkui/services.py b/src/gpodder/gtkui/services.py index 5625b265..2147c6ff 100644 --- a/src/gpodder/gtkui/services.py +++ b/src/gpodder/gtkui/services.py @@ -118,7 +118,7 @@ class CoverDownloader(ObservableService): try: pixbuf = GdkPixbuf.Pixbuf.new_from_file(filename) except Exception as e: - logger.warn('Cannot load cover art', exc_info=True) + logger.warning('Cannot load cover art', exc_info=True) if pixbuf is None and filename.startswith(channel.cover_file): logger.info('Deleting broken cover: %s', filename) util.delete_file(filename) @@ -126,7 +126,7 @@ class CoverDownloader(ObservableService): try: pixbuf = GdkPixbuf.Pixbuf.new_from_file(filename) except Exception as e: - logger.warn('Corrupt cover art on server, deleting', exc_info=True) + logger.warning('Corrupt cover art on server, deleting', exc_info=True) util.delete_file(filename) if async_mode: diff --git a/src/gpodder/log.py b/src/gpodder/log.py index c8bd4ff5..c81080be 100644 --- a/src/gpodder/log.py +++ b/src/gpodder/log.py @@ -61,7 +61,7 @@ def setup(verbose=True, quiet=False): try: os.makedirs(logging_directory) except: - logger.warn('Cannot create output directory: %s', + logger.warning('Cannot create output directory: %s', logging_directory) return False @@ -77,7 +77,7 @@ def setup(verbose=True, quiet=False): try: os.remove(old_logfile) except: - logger.warn('Cannot purge logfile: %s', exc_info=True) + logger.warning('Cannot purge logfile: %s', exc_info=True) root = logging.getLogger() logfile = os.path.join(logging_directory, logging_basename) diff --git a/src/gpodder/model.py b/src/gpodder/model.py index 2f28d9c9..6a1028cc 100644 --- a/src/gpodder/model.py +++ b/src/gpodder/model.py @@ -161,7 +161,7 @@ class PodcastParserFeed(Feed): num_duplicate_guids += 1 channel._update_error = ('Discarded {} episode(s) with non-unique GUID, contact the podcast publisher to fix this issue.' .format(num_duplicate_guids)) - logger.warn('Discarded episode with non-unique GUID, contact the podcast publisher to fix this issue. [%s] [%s]', + logger.warning('Discarded episode with non-unique GUID, contact the podcast publisher to fix this issue. [%s] [%s]', channel.title, episode.title) continue @@ -660,7 +660,7 @@ class PodcastEpisode(PodcastModelObject): if not check_only and (force_update or not self.download_filename): # Avoid and catch gPodder bug 1440 and similar situations if template == '': - logger.warn('Empty template. Report this podcast URL %s', + logger.warning('Empty template. Report this podcast URL %s', self.channel.url) template = None @@ -673,7 +673,7 @@ class PodcastEpisode(PodcastModelObject): if 'redirect' in episode_filename and template is None: # This looks like a redirection URL - force URL resolving! - logger.warn('Looks like a redirection to me: %s', self.url) + logger.warning('Looks like a redirection to me: %s', self.url) url = util.get_real_url(self.channel.authenticate_url(self.url)) logger.info('Redirection resolved to: %s', url) episode_filename, _ = util.filename_from_url(url) @@ -716,7 +716,7 @@ class PodcastEpisode(PodcastModelObject): # call it from the downloading code before saving the file logger.info('Choosing new filename: %s', new_file_name) else: - logger.warn('%s exists or %s does not', new_file_name, old_file_name) + logger.warning('%s exists or %s does not', new_file_name, old_file_name) logger.info('Updating filename of %s to "%s".', self.url, wanted_filename) elif self.download_filename is None: logger.info('Setting download filename: %s', wanted_filename) @@ -787,7 +787,7 @@ class PodcastEpisode(PodcastModelObject): try: return datetime.datetime.fromtimestamp(self.published).strftime('%H%M') except: - logger.warn('Cannot format pubtime: %s', self.title, exc_info=True) + logger.warning('Cannot format pubtime: %s', self.title, exc_info=True) return '0000' def playlist_title(self): @@ -942,7 +942,7 @@ class PodcastChannel(PodcastModelObject): logger.debug('Strategy for %s changed to %s', self.title, caption) self.download_strategy = download_strategy else: - logger.warn('Cannot set strategy to %d', download_strategy) + logger.warning('Cannot set strategy to %d', download_strategy) def rewrite_url(self, new_url): new_url = util.normalize_feed_url(new_url) @@ -1036,7 +1036,7 @@ class PodcastChannel(PodcastModelObject): break if not found and not util.is_system_file(filename): - logger.warn('Unknown external file: %s', filename) + logger.warning('Unknown external file: %s', filename) @classmethod def sort_key(cls, podcast): diff --git a/src/gpodder/my.py b/src/gpodder/my.py index fa6ef269..45afbcca 100644 --- a/src/gpodder/my.py +++ b/src/gpodder/my.py @@ -445,7 +445,7 @@ class MygPoClient(object): def flush(self, now=False): if not self.can_access_webservice(): - logger.warn('Flush requested, but sync disabled.') + logger.warning('Flush requested, but sync disabled.') return if self._worker_thread is None or now: @@ -512,7 +512,7 @@ class MygPoClient(object): raise except Exception as e: - logger.warn('Exception while polling for episodes.', exc_info=True) + logger.warning('Exception while polling for episodes.', exc_info=True) # Step 2: Upload Episode actions @@ -534,7 +534,7 @@ class MygPoClient(object): return True except (MissingCredentials, mygpoclient.http.Unauthorized): - logger.warn('Invalid credentials. Disabling gpodder.net.') + logger.warning('Invalid credentials. Disabling gpodder.net.') self._config.mygpo.enabled = False return False @@ -599,7 +599,7 @@ class MygPoClient(object): return True except (MissingCredentials, mygpoclient.http.Unauthorized): - logger.warn('Invalid credentials. Disabling gpodder.net.') + logger.warning('Invalid credentials. Disabling gpodder.net.') self._config.mygpo.enabled = False return False @@ -616,7 +616,7 @@ class MygPoClient(object): return True except (MissingCredentials, mygpoclient.http.Unauthorized): - logger.warn('Invalid credentials. Disabling gpodder.net.') + logger.warning('Invalid credentials. Disabling gpodder.net.') self._config.mygpo.enabled = False return False @@ -632,7 +632,7 @@ class MygPoClient(object): devices = self._client.get_devices() except (MissingCredentials, mygpoclient.http.Unauthorized): - logger.warn('Invalid credentials. Disabling gpodder.net.') + logger.warning('Invalid credentials. Disabling gpodder.net.') self._config.mygpo.enabled = False raise diff --git a/src/gpodder/plugins/soundcloud.py b/src/gpodder/plugins/soundcloud.py index 951bce50..069b809c 100644 --- a/src/gpodder/plugins/soundcloud.py +++ b/src/gpodder/plugins/soundcloud.py @@ -147,7 +147,7 @@ class SoundcloudUser(object): total_count = len(json_tracks) if len(tracks) == 0 and total_count > 0: - logger.warn("Download of all %i %s of user %s is disabled" % + logger.warning("Download of all %i %s of user %s is disabled" % (total_count, feed, self.username)) else: logger.info("%i/%i downloadable tracks for user %s %s feed" % diff --git a/src/gpodder/sync.py b/src/gpodder/sync.py index 674835de..ba3f397d 100644 --- a/src/gpodder/sync.py +++ b/src/gpodder/sync.py @@ -94,15 +94,15 @@ def get_track_length(filename): # Notify user on eyed3 success if mplayer failed. # A warning is used to make it visible in gpo or on console. if attempted: - logger.warn('eyed3.mp3 successfully determined length: %s', filename) + logger.warning('eyed3.mp3 successfully determined length: %s', filename) return length except Exception: logger.error('eyed3.mp3 could not determine length: %s', filename, exc_info=True) attempted = True if not attempted: - logger.warn('Could not determine length: %s', filename) - logger.warn('Please install MPlayer or the eyed3.mp3 module for track length detection.') + logger.warning('Could not determine length: %s', filename) + logger.warning('Please install MPlayer or the eyed3.mp3 module for track length detection.') return int(60 * 60 * 1000 * 3) # Default is three hours (to be on the safe side) @@ -608,7 +608,7 @@ class MP3PlayerDevice(Device): needed = util.calculate_size(from_file) free = self.get_free_space() if free == -1: - logger.warn('Cannot determine free disk space on device') + logger.warning('Cannot determine free disk space on device') elif needed > free: d = {'path': self.destination, 'free': util.format_filesize(free), 'need': util.format_filesize(needed)} message = _('Not enough space in %(path)s: %(free)s available, but need at least %(need)s') diff --git a/src/gpodder/syncui.py b/src/gpodder/syncui.py index 92415a15..d8df1e32 100644 --- a/src/gpodder/syncui.py +++ b/src/gpodder/syncui.py @@ -255,7 +255,7 @@ class gPodderSyncUI(object): try: episodes_to_delete.append(episode_dict[episode_filename]) except KeyError as ioe: - logger.warn('Episode %s, removed from device has already been deleted from gpodder', + logger.warning('Episode %s, removed from device has already been deleted from gpodder', episode_filename) # delete all episodes from gpodder (will prompt user) diff --git a/src/gpodder/util.py b/src/gpodder/util.py index edc48b75..187b16e6 100644 --- a/src/gpodder/util.py +++ b/src/gpodder/util.py @@ -90,7 +90,7 @@ N_ = gpodder.ngettext try: locale.setlocale(locale.LC_ALL, '') except Exception as e: - logger.warn('Cannot set locale (%s)', e, exc_info=True) + logger.warning('Cannot set locale (%s)', e, exc_info=True) # Native filesystem encoding detection encoding = sys.getfilesystemencoding() @@ -198,7 +198,7 @@ def make_directory(path): except GLib.Error as err: # The sync might be multithreaded, so directories can be created by other threads if not err.matches(Gio.io_error_quark(), Gio.IOErrorEnum.EXISTS): - logger.warn('Could not create directory %s: %s', path.get_uri(), err.message) + logger.warning('Could not create directory %s: %s', path.get_uri(), err.message) return False return True @@ -404,9 +404,9 @@ def calculate_size(path): try: sum += calculate_size(os.path.join(path, item)) except: - logger.warn('Cannot get size for %s', path, exc_info=True) + logger.warning('Cannot get size for %s', path, exc_info=True) except: - logger.warn('Cannot access %s', path, exc_info=True) + logger.warning('Cannot access %s', path, exc_info=True) return sum @@ -430,7 +430,7 @@ def file_modification_datetime(filename): timestamp = s[stat.ST_MTIME] return datetime.datetime.fromtimestamp(timestamp) except: - logger.warn('Cannot get mtime for %s', filename, exc_info=True) + logger.warning('Cannot get mtime for %s', filename, exc_info=True) return None @@ -457,7 +457,7 @@ def file_modification_timestamp(filename): s = os.stat(filename) return s[stat.ST_MTIME] except: - logger.warn('Cannot get modification timestamp for %s', filename) + logger.warning('Cannot get modification timestamp for %s', filename) return -1 @@ -548,10 +548,10 @@ def format_date(timestamp): try: timestamp_date = time.localtime(timestamp)[:3] except ValueError as ve: - logger.warn('Cannot convert timestamp', exc_info=True) + logger.warning('Cannot convert timestamp', exc_info=True) return None except TypeError as te: - logger.warn('Cannot convert timestamp', exc_info=True) + logger.warning('Cannot convert timestamp', exc_info=True) return None if timestamp_date == today: @@ -562,7 +562,7 @@ def format_date(timestamp): try: diff = int((time.time() - timestamp) / seconds_in_a_day) except: - logger.warn('Cannot convert "%s" to date.', timestamp, exc_info=True) + logger.warning('Cannot convert "%s" to date.', timestamp, exc_info=True) return None try: @@ -1111,7 +1111,7 @@ def object_string_formatter(s, **kwargs): to_s = str(getattr(o, attr)) result = result.replace(from_s, to_s) except: - logger.warn('Replace of "%s" failed for "%s".', attr, s) + logger.warning('Replace of "%s" failed for "%s".', attr, s) return result @@ -1977,7 +1977,7 @@ def connection_available(): return online except Exception as e: - logger.warn('Cannot get connection status: %s', e, exc_info=True) + logger.warning('Cannot get connection status: %s', e, exc_info=True) # When we can't determine the connection status, act as if we're online (bug 1730) return True