lyrics safely decoded from bytes

beets/mediafile.py

@@ -455,6 +455,8 @@ class MediaField(object):
                         if self.out_type == bool:
                             # store bools as 1,0 instead of True,False
                             out = unicode(int(out))
+                        elif isinstance(out, str):
+                            out = out.decode('utf8', 'ignore')
                         else:
                             out = unicode(out)
                 elif style.as_type == int:

beetsplug/lyrics.py

@@ -124,6 +124,8 @@ def get_lyrics(artist, title):
     for backend in BACKENDS:
         lyrics = backend(artist, title)
         if lyrics:
+            if isinstance(lyrics, str):
+                lyrics = lyrics.decode('utf8', 'ignore')
             return lyrics