openlp
/
openlp
mirror of https://gitlab.com/openlp/openlp.git
1
0
Fork 1
Code Issues Projects Releases Wiki Activity

Fixed bug #794971 by typecasting the title and lyrics fields to unicode objects if they are buffer objects. 

bzr-revno: 1679
This commit is contained in:
Raoul Snyman 2011-07-08 14:53:36 +02:00
parent 2ddcd717bf 5581a74034
commit b4358a2005
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -267,6 +267,12 @@ def clean_song(manager, song):
``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''