raoul
/
openlp
forked from openlp/openlp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

missed some instances of unicode

This commit is contained in:
Philip Ridout 2013-09-07 17:37:40 +00:00
parent 44ead21598
commit 3499f1ee65
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openlp/plugins/songs/lib/songshowplusimport.py
View File

@ -160,7 +160,7 @@ class SongShowPlusImport(SongImport):
elif block_key == VERSE_ORDER:
verse_tag = self.to_openlp_verse_tag(data, True)
if verse_tag:
if not isinstance(verse_tag, unicode):
if not isinstance(verse_tag, str):
verse_tag = self.decode(verse_tag)
self.ssp_verse_order_list.append(verse_tag)
elif block_key == SONG_BOOK:
@ -210,6 +210,6 @@ class SongShowPlusImport(SongImport):
def decode(self, data):
try:
return unicode(data, chardet.detect(data)['encoding'])
return str(data, chardet.detect(data)['encoding'])
except:
return unicode(data, 'cp1252')
return str(data, 'cp1252')