Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/bug-792204 into
lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
Related bugs:
Bug #792204 in OpenLP: "SongShow Plus importer fails to import song"
https://bugs.launchpad.net/openlp/+bug/792204
For more details, see:
https://code.launchpad.net/~raoul-snyman/openlp/bug-792204/+merge/64495
Fixed bug #792204: SongShow Plus importer fails to import song.
--
https://code.launchpad.net/~raoul-snyman/openlp/bug-792204/+merge/64495
Your team OpenLP Core is requested to review the proposed merge of
lp:~raoul-snyman/openlp/bug-792204 into lp:openlp.
=== modified file 'openlp/plugins/songs/lib/songshowplusimport.py'
--- openlp/plugins/songs/lib/songshowplusimport.py 2011-06-12 16:02:52 +0000
+++ openlp/plugins/songs/lib/songshowplusimport.py 2011-06-14 05:48:35 +0000
@@ -165,8 +165,9 @@
elif blockKey == VERSE_ORDER:
verseTag = self.toOpenLPVerseTag(data, True)
if verseTag:
- self.sspVerseOrderList.append(unicode(verseTag,
- u'cp1252'))
+ if not isinstance(verseTag, unicode):
+ verseTag = unicode(verseTag, u'cp1252')
+ self.sspVerseOrderList.append(verseTag)
elif blockKey == SONG_BOOK:
self.song_book_name = unicode(data, u'cp1252')
elif blockKey == SONG_NUMBER:
_______________________________________________
Mailing list: https://launchpad.net/~openlp-core
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openlp-core
More help : https://help.launchpad.net/ListHelp
