From 321f862f23ebdc0b300ff905cda526a601fbcbb0 Mon Sep 17 00:00:00 2001 From: Fabrice Laporte Date: Tue, 9 Dec 2014 23:37:42 +0100 Subject: [PATCH] fix #1135 --- beetsplug/lyrics.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/beetsplug/lyrics.py b/beetsplug/lyrics.py index 05fb341e9..08344701f 100644 --- a/beetsplug/lyrics.py +++ b/beetsplug/lyrics.py @@ -298,8 +298,7 @@ def is_lyrics(text, artist=None): badTriggersOcc = [] nbLines = text.count('\n') if nbLines <= 1: - log.debug(u"Ignoring too short lyrics '{0}'".format( - text.decode('utf8'))) + log.debug(u"Ignoring too short lyrics '{0}'".format(text)) return 0 elif nbLines < 5: badTriggersOcc.append('too_short') @@ -370,7 +369,8 @@ def scrape_lyrics_from_html(html): return None soup = sorted(soup.stripped_strings, key=len)[-1] - + if isinstance(soup, str): + soup = soup.decode('utf8', 'ignore') return soup @@ -501,8 +501,6 @@ class LyricsPlugin(BeetsPlugin): for backend in self.backends: lyrics = backend(artist, title) if lyrics: - if isinstance(lyrics, str): - lyrics = lyrics.decode('utf8', 'ignore') log.debug(u'got lyrics from backend: {0}' .format(backend.__name__)) return lyrics.strip()