anssi

Index: resources/lib/scrapers/lyricstime/lyricsScraper.py===================================================================--- resources/lib/scrapers/lyricstime/lyricsScraper.py+++ resources/lib/scrapers/lyricstime/lyricsScraper.py	2011-01-01 08:55:40.075515336 +0200@@ -155,7 +155,7 @@             lyr = song_search.split('<div id="songlyrics" >')[1].split('</div>')[0]#.replace("<p>","").replace("</p>","").replace("<br />","")                  lyr = self.clean_br_regex.sub( "\n", lyr ).strip()             lyr = self.clean_lyrics_regex.sub( "", lyr ).strip()
-            lyr = self.normalize_lyrics_regex.sub( lambda m: unichr( int( m.group( 1 ) ) ), lyr ).encode( "UTF-8", "replace" ).decode( "UTF-8" )+            lyr = self.normalize_lyrics_regex.sub( lambda m: unichr( int( m.group( 1 ) ) ), lyr.decode("ISO-8859-1") )             lyr = u"\n".join( [ lyric.strip() for lyric in lyr.splitlines() ] )             lyr = self.clean_info_regex.sub( "", lyr )                  l.lyrics = lyrIndex: resources/lib/scrapers/lyricsmode/lyricsScraper.py===================================================================--- resources/lib/scrapers/lyricsmode/lyricsScraper.py+++ resources/lib/scrapers/lyricsmode/lyricsScraper.py	2011-01-01 08:53:02.380019162 +0200@@ -156,7 +156,7 @@             lyr = song_search.split("<div id='songlyrics_h' class='dn'>")[1].split('<!-- /SONG LYRICS -->')[0]             lyr = self.clean_br_regex.sub( "\n", lyr ).strip()
             lyr = self.clean_lyrics_regex.sub( "", lyr ).strip()
-            lyr = self.normalize_lyrics_regex.sub( lambda m: unichr( int( m.group( 1 ) ) ), lyr ).encode( "UTF-8", "replace" ).decode( "UTF-8" )
+            lyr = self.normalize_lyrics_regex.sub( lambda m: unichr( int( m.group( 1 ) ) ), lyr.decode("ISO-8859-1") )             lyr = u"\n".join( [ lyric.strip() for lyric in lyr.splitlines() ] )                    l.lyrics = lyr             l.source = __title__