openlp-core team mailing list archive

[Raoul Snyman <raoul.snyman@xxxxxxxxxxxxxxxxxxxxxxxx>]

Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/bug-794971 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #794971 in OpenLP: "User can not import songs from1.9.4 to 1.9.5"
  https://bugs.launchpad.net/openlp/+bug/794971

For more details, see:
https://code.launchpad.net/~raoul-snyman/openlp/bug-794971/+merge/67283

Fixed bug #794971 by typecasting the title and lyrics fields to unicode objects if they are buffer objects.
-- 
https://code.launchpad.net/~raoul-snyman/openlp/bug-794971/+merge/67283
Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/bug-794971 into lp:openlp.

=== modified file 'openlp/plugins/songs/lib/__init__.py'
--- openlp/plugins/songs/lib/__init__.py	2011-06-12 16:02:52 +0000
+++ openlp/plugins/songs/lib/__init__.py	2011-07-08 06:42:56 +0000
@@ -267,6 +267,12 @@
     ``song``
         The song object.
     """
+    if isinstance(song.title, buffer):
+        song.title = unicode(song.title)
+    if isinstance(song.alternate_title, buffer):
+        song.alternate_title = unicode(song.alternate_title)
+    if isinstance(song.lyrics, buffer):
+        song.lyrics = unicode(song.lyrics)
     song.title = song.title.rstrip() if song.title else u''
     if song.alternate_title is None:
         song.alternate_title = u''