From f2fc1a78bf636c11ed92322125f613eb84488bc7 Mon Sep 17 00:00:00 2001 From: Peter Kessen Date: Sat, 20 Feb 2016 13:59:58 +0100 Subject: [PATCH] Removed import of unicode_literals from plugins * keyfinder * lastimport * lyrics --- beetsplug/keyfinder.py | 9 ++++----- beetsplug/lastimport.py | 33 ++++++++++++++++----------------- beetsplug/lyrics.py | 31 ++++++++++++++++--------------- 3 files changed, 36 insertions(+), 37 deletions(-) diff --git a/beetsplug/keyfinder.py b/beetsplug/keyfinder.py index fc9c7b148..cc96cb886 100644 --- a/beetsplug/keyfinder.py +++ b/beetsplug/keyfinder.py @@ -16,8 +16,7 @@ """Uses the `KeyFinder` program to add the `initial_key` field. """ -from __future__ import (division, absolute_import, print_function, - unicode_literals) +from __future__ import (division, absolute_import, print_function) import subprocess @@ -41,7 +40,7 @@ class KeyFinderPlugin(BeetsPlugin): def commands(self): cmd = ui.Subcommand('keyfinder', - help='detect and add initial key from audio') + help=u'detect and add initial key from audio') cmd.func = self.command return [cmd] @@ -63,12 +62,12 @@ class KeyFinderPlugin(BeetsPlugin): output = util.command_output([bin, b'-f', util.syspath(item.path)]) except (subprocess.CalledProcessError, OSError) as exc: - self._log.error('execution failed: {0}', exc) + self._log.error(u'execution failed: {0}', exc) continue except UnicodeEncodeError: # Workaround for Python 2 Windows bug. # http://bugs.python.org/issue1759845 - self._log.error('execution failed for Unicode path: {0!r}', + self._log.error(u'execution failed for Unicode path: {0!r}', item.path) continue diff --git a/beetsplug/lastimport.py b/beetsplug/lastimport.py index 38b5bfc10..763a24a8c 100644 --- a/beetsplug/lastimport.py +++ b/beetsplug/lastimport.py @@ -13,8 +13,7 @@ # The above copyright notice and this permission notice shall be # included in all copies or substantial portions of the Software. -from __future__ import (division, absolute_import, print_function, - unicode_literals) +from __future__ import (division, absolute_import, print_function) import pylast from pylast import TopItem, _extract, _number @@ -44,7 +43,7 @@ class LastImportPlugin(plugins.BeetsPlugin): } def commands(self): - cmd = ui.Subcommand('lastimport', help='import last.fm play-count') + cmd = ui.Subcommand('lastimport', help=u'import last.fm play-count') def func(lib, opts, args): import_lastfm(lib, self._log) @@ -115,9 +114,9 @@ def import_lastfm(lib, log): per_page = config['lastimport']['per_page'].get(int) if not user: - raise ui.UserError('You must specify a user name for lastimport') + raise ui.UserError(u'You must specify a user name for lastimport') - log.info('Fetching last.fm library for @{0}', user) + log.info(u'Fetching last.fm library for @{0}', user) page_total = 1 page_current = 0 @@ -126,7 +125,7 @@ def import_lastfm(lib, log): retry_limit = config['lastimport']['retry_limit'].get(int) # Iterate through a yet to be known page total count while page_current < page_total: - log.info('Querying page #{0}{1}...', + log.info(u'Querying page #{0}{1}...', page_current + 1, '/{}'.format(page_total) if page_total > 1 else '') @@ -134,7 +133,7 @@ def import_lastfm(lib, log): tracks, page_total = fetch_tracks(user, page_current + 1, per_page) if page_total < 1: # It means nothing to us! - raise ui.UserError('Last.fm reported no data.') + raise ui.UserError(u'Last.fm reported no data.') if tracks: found, unknown = process_tracks(lib, tracks, log) @@ -142,22 +141,22 @@ def import_lastfm(lib, log): unknown_total += unknown break else: - log.error('ERROR: unable to read page #{0}', + log.error(u'ERROR: unable to read page #{0}', page_current + 1) if retry < retry_limit: log.info( - 'Retrying page #{0}... ({1}/{2} retry)', + u'Retrying page #{0}... ({1}/{2} retry)', page_current + 1, retry + 1, retry_limit ) else: - log.error('FAIL: unable to fetch page #{0}, ', - 'tried {1} times', page_current, retry + 1) + log.error(u'FAIL: unable to fetch page #{0}, ', + u'tried {1} times', page_current, retry + 1) page_current += 1 - log.info('... done!') - log.info('finished processing {0} song pages', page_total) - log.info('{0} unknown play-counts', unknown_total) - log.info('{0} play-counts imported', found_total) + log.info(u'... done!') + log.info(u'finished processing {0} song pages', page_total) + log.info(u'{0} unknown play-counts', unknown_total) + log.info(u'{0} play-counts imported', found_total) def fetch_tracks(user, page, limit): @@ -191,7 +190,7 @@ def process_tracks(lib, tracks, log): total = len(tracks) total_found = 0 total_fails = 0 - log.info('Received {0} tracks in this page, processing...', total) + log.info(u'Received {0} tracks in this page, processing...', total) for num in xrange(0, total): song = None @@ -244,7 +243,7 @@ def process_tracks(lib, tracks, log): artist, title, album) if total_fails > 0: - log.info('Acquired {0}/{1} play-counts ({2} unknown)', + log.info(u'Acquired {0}/{1} play-counts ({2} unknown)', total_found, total, total_fails) return total_found, total_fails diff --git a/beetsplug/lyrics.py b/beetsplug/lyrics.py index 9e5e2fad6..1b046c218 100644 --- a/beetsplug/lyrics.py +++ b/beetsplug/lyrics.py @@ -16,8 +16,7 @@ """Fetches, embeds, and displays lyrics. """ -from __future__ import (division, absolute_import, print_function, - unicode_literals) +from __future__ import (division, absolute_import, print_function) import re import requests @@ -107,7 +106,7 @@ def extract_text_in(html, starttag): parts.append(html[pos:match.start()]) break else: - print('no closing tag found!') + print(u'no closing tag found!') return return u''.join(parts) @@ -237,7 +236,7 @@ class Genius(Backend): url = u'https://api.genius.com/search?q=%s' \ % (urllib.quote(query.encode('utf8'))) - self._log.debug('genius: requesting search {}', url) + self._log.debug(u'genius: requesting search {}', url) try: req = requests.get( url, @@ -246,19 +245,19 @@ class Genius(Backend): ) req.raise_for_status() except requests.RequestException as exc: - self._log.debug('genius: request error: {}', exc) + self._log.debug(u'genius: request error: {}', exc) return None try: return req.json() except ValueError: - self._log.debug('genius: invalid response: {}', req.text) + self._log.debug(u'genius: invalid response: {}', req.text) return None def get_lyrics(self, link): url = u'http://genius-api.com/api/lyricsInfo' - self._log.debug('genius: requesting lyrics for link {}', link) + self._log.debug(u'genius: requesting lyrics for link {}', link) try: req = requests.post( url, @@ -268,13 +267,13 @@ class Genius(Backend): ) req.raise_for_status() except requests.RequestException as exc: - self._log.debug('genius: request error: {}', exc) + self._log.debug(u'genius: request error: {}', exc) return None try: return req.json() except ValueError: - self._log.debug('genius: invalid response: {}', req.text) + self._log.debug(u'genius: invalid response: {}', req.text) return None def build_lyric_string(self, lyrics): @@ -576,12 +575,14 @@ class LyricsPlugin(plugins.BeetsPlugin): def commands(self): cmd = ui.Subcommand('lyrics', help='fetch song lyrics') - cmd.parser.add_option('-p', '--print', dest='printlyr', - action='store_true', default=False, - help='print lyrics to console') - cmd.parser.add_option('-f', '--force', dest='force_refetch', - action='store_true', default=False, - help='always re-download lyrics') + cmd.parser.add_option( + u'-p', u'--print', dest='printlyr', + action='store_true', default=False, + help=u'print lyrics to console') + cmd.parser.add_option( + u'-f', u'--force', dest='force_refetch', + action='store_true', default=False, + help=u'always re-download lyrics') def func(lib, opts, args): # The "write to files" option corresponds to the