From 897f7a7dbbda3b379b8b33ca7f9aa725e63a06ee Mon Sep 17 00:00:00 2001
From: Raoul Snyman <raoul.snyman@saturnlaboratories.co.za>
Date: Fri, 8 Jul 2011 08:31:34 +0200
Subject: [PATCH] Fixed bug #794971: Typecast the buffer object to a unicode
 object.

---
 openlp/plugins/songs/lib/__init__.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/openlp/plugins/songs/lib/__init__.py b/openlp/plugins/songs/lib/__init__.py
index 308ff6aa1..409564553 100644
--- a/openlp/plugins/songs/lib/__init__.py
+++ b/openlp/plugins/songs/lib/__init__.py
@@ -267,6 +267,10 @@ def clean_song(manager, song):
     ``song``
         The song object.
     """
+    if not isinstance(song.title, basestring):
+        song.title = unicode(song.title)
+    if not isinstance(song.lyrics, basestring):
+        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''